Changeset 3515


Ignore:
Timestamp:
Feb 18, 2016, 12:06:40 AM (21 months ago)
Author:
bruno
Message:

Fix xorriso usage for mindi with option -as mkisofs
Better ISO_CMD variable management

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3513 r3515  
    116116if [ ! -x $ISO_CMD ]; then
    117117    ISO_CMD="/usr/bin/genisoimage"
    118 fi
    119 
    120 # For compatibility with previous versions default to mkisofs
    121 if [ ! -x $ISO_CMD ]; then
    122     ISO_CMD="/usr/bin/mkisofs"
    123 fi
     118    # For compatibility with previous versions default to mkisofs
     119    if [ ! -x $ISO_CMD ]; then
     120        ISO_CMD="/usr/bin/mkisofs"
     121    fi
     122    if [ ! -x $ISO_CMD ]; then
     123        LogFile "NOTE: No CD image (ISO file) utility found"
     124        ISO_CMD = ""
     125    fi
     126else
     127    ISO_CMD="/usr/bin/xorriso -as mkisofs"
     128fi
     129
     130
    124131
    125132ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi"
     
    131138    BOOT_TYPE="UEFI"
    132139    ISO_OPT="$ISO_OPT -eltorito-alt-boot -efi-boot images/mindi-bootroot.img -no-emul-boot"
    133     if [ "$ISO_CMD" = "/usr/bin/xorriso" ]; then
     140    echo "$ISO_CMD" | grep -q "xorriso"
     141    if [ $? -eq 0 ]; then
    134142        ISO_OPT="$ISO_OPT -eltorito-alt-boot --efi-boot images/mindi-bootroot.img -no-emul-boot"
    135143    fi
     
    31793187fi
    31803188
    3181 # Check for ISO_CMD command
    3182 if [ ! -x $ISO_CMD ]; then
    3183     LogFile "NOTE: No CD image (ISO file) utility found"
    3184 fi
    3185 
    31863189FLOPPY_WAS_MOUNTED=""
    31873190for mtpt in /media/floppy /mnt/floppy /floppy ; do
Note: See TracChangeset for help on using the changeset viewer.