Changeset 3596 for branches


Ignore:
Timestamp:
Jul 6, 2016, 4:15:31 PM (3 years ago)
Author:
bruno
Message:

-Fix volid warning

  • Try to improve UEFI support with xorriso (remove unsupported option eltorito-platform)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/mindi/mindi

    r3595 r3596  
    127127fi
    128128
    129 ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V Mindi-Image -o $MINDI_CACHE/mindi.iso "
     129ISO_OPT="-J -r -v -p Mindi -publisher http://www.mondorescue.org -A Mindi -V MindiCD -o $MINDI_CACHE/mindi.iso "
    130130
    131131# Mindi set this as default in case it's invoked alone
     
    14681468
    14691469LogFile "----------- $ISO_CMD's errors --------------"
     1470LogAll "Command invoked: $CMD ."
    14701471LogAll "$ISO_CMD returned the following errors:"
    14711472cat $MINDI_TMP/mkisofs.log | tee -a $LOGFILE
     
    14751476MakeISO() {
    14761477
    1477 LogAll "INFO: Invoking $CMD ."
     1478LogAll "INFO: Generating ISO image."
    14781479(cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
    14791480if [ $? -ne 0 ] ; then
     1481    # In case of UEFI handle differences in option handling
    14801482    if [ "$BOOT_TYPE" = "UEFI" ]; then
    14811483        CMD=`echo $CMD | perl -p -e 's|--efi-boot |-eltorito-platform 0xEF -eltorito-boot |; s|-efi-boot |-eltorito-platform 0xEF -eltorito-boot |;'`
    1482         LogAll "INFO: Invoking instead $CMD"
    14831484        (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
    1484         if [ $? -eq 0 ] ; then
     1485        if [ $? -ne 0 ] ; then
     1486            # xorriso e.g.
     1487            CMD=`echo $CMD | perl -p -e 's|-eltorito-platform 0xEF ||'`
     1488            (cd "$MINDI_TMP/mpt" ; $CMD .) > /dev/null 2> $MINDI_TMP/mkisofs.log
     1489            if [ $? -eq 0 ] ; then
     1490                LogAll "INFO: Invoking $CMD ."
     1491                LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
     1492            else
     1493                MakeISOErrors
     1494        else
     1495            LogAll "INFO: Invoking $CMD ."
    14851496            LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
    1486         else
    1487             MakeISOErrors
    14881497        fi
    14891498    else
     
    14911500    fi
    14921501else
     1502    LogAll "INFO: Invoking $CMD ."
    14931503    LogAll "INFO: Created bootable ISO image at $MINDI_CACHE/mindi.iso"
    14941504fi
Note: See TracChangeset for help on using the changeset viewer.