Changeset 3505


Ignore:
Timestamp:
Feb 12, 2016, 4:12:26 PM (20 months ago)
Author:
bruno
Message:
  • Should fix errors when used with xorriso and UEFI (option efi-boot should have -- in that case not -)
Location:
branches/3.2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3502 r3505  
    115115# use it if it's available.
    116116if [ ! -x $ISO_CMD ]; then
    117     ISO_CMD=/usr/bin/genisoimage
     117    ISO_CMD="/usr/bin/genisoimage"
    118118fi
    119119
    120120# For compatibility with previous versions default to mkisofs
    121121if [ ! -x $ISO_CMD ]; then
    122     ISO_CMD=/usr/bin/mkisofs
     122    ISO_CMD="/usr/bin/mkisofs"
    123123fi
    124124
     
    131131    BOOT_TYPE="UEFI"
    132132    ISO_OPT="$ISO_OPT -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot"
     133    if [ "$ISO_CMD" = "/usr/bin/xorriso" ]; then
     134        ISO_OPT="$ISO_OPT -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot"
     135    fi
    133136else
    134137    # Find MBR in case of bootable USB device to build
     
    15451548    if [ "$?" -ne "0" ] ; then
    15461549        if [ "$BOOT_TYPE" = "UEFI" ]; then
     1550            CMD=`echo $CMD | perl -p -e 's|--efi-boot |-eltorito-platform 0xEF -eltorito-boot |'`
    15471551            CMD=`echo $CMD | perl -p -e 's|-efi-boot |-eltorito-platform 0xEF -eltorito-boot |'`
    15481552            $CMD . > /dev/null 2> $MINDI_TMP/mkisofs.log
  • branches/3.2/mondo/src/common/libmondo-archive.c

    r3502 r3505  
    17071707        if (find_home_of_exe("xorriso")) {
    17081708            mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
    1709         else if (find_home_of_exe("genisoimage")) {
     1709        } else if (find_home_of_exe("genisoimage")) {
    17101710            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
    17111711        } else {
     
    17441744                log_msg(1, "Isolinux");
    17451745                if (bkpinfo->boot_type == UEFI) {
    1746                     mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
     1746                    if (strstr(isofs_cmd,"xorriso")) {
     1747                        mr_asprintf(uefistr, "%s", MONDO_XORRISO_UEFI);
     1748                    } else {
     1749                        mr_asprintf(uefistr, "%s", MONDO_MKISOFS_UEFI);
     1750                    }
    17471751                } else {
    17481752                    mr_asprintf(uefistr, " ");
  • branches/3.2/mondo/src/include/my-stuff.h

    r3502 r3505  
    178178#define MONDO_MKISOFS_CMD "mkisofs"
    179179#define MONDO_GENISOIMAGE_CMD "genisoimage"
    180 #define MONDO_XORRISO_CMD "xorriso"
     180#define MONDO_XORRISO_CMD "xorriso -as mkisofs"
    181181#define MONDO_MKISOFS " -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version "
    182182#define MONDO_MKISOFS_UEFI " -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot "
     183#define MONDO_XORRISO_UEFI " -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot "
    183184
    184185/**
     
    205206 * @c growisofs command to generate a bootable DVD using isolinux, except for the directory to image.
    206207 */
    207 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke -J -no-emul-boot -boot-load-size 4 -b syslinux/isolinux.bin --boot-info-table -c syslinux/boot.cat -boot-load-size 4 -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_ -v"
     208#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX" -V _CD#_ -v"
    208209
    209210/**
    210211 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    211212     */
    212 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke -no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     213#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO" -V _CD#_ -v"
    213214
    214215/**
    215216 * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    216217     */
    217 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     218#define MONDO_GROWISOFS_REGULAR_LILO     "growisofs -no-emul-boot -b syslinux/isolinux.bin -c syslinux/boot.cat -J "MONDO_MKISOFS" -V _CD#_ -v"
    218219
    219220/**
    220221 * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
    221222 */
    222 #define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ -v"
     223#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke -J "MONDO_MKISOFS" -V _CD#_ -v"
    223224
    224225/**
Note: See TracChangeset for help on using the changeset viewer.