X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=d8f4be51cf184f6c88892e413f5a86284eb264c2;hp=e84e2674cfd6f013e8cc9d989a4d2c63a1078ba6;hb=6cc6422766a843fe6f91f5d97fe46ccb695f7af1;hpb=0ab2a7261eef1435cf5b0ce1180e826f4c663414

diff --git a/grml2iso b/grml2iso
index e84e267..d8f4be5 100755
--- a/grml2iso
+++ b/grml2iso
@@ -7,6 +7,9 @@
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
+# make sure we have the sbin directories in our PATH to find grml2usb ootb
+PATH="${PATH}:/sbin:/usr/local/sbin:/usr/sbin"
+
 # define function getfilesize before "set -e" {{{
   if stat --help >/dev/null 2>&1; then
     getfilesize='stat -c %s'        # GNU stat
@@ -29,12 +32,12 @@ elif which mkisofs >/dev/null 2>&1; then
 elif which genisoimage >/dev/null 2>&1; then
   MKISOFS='genisoimage'
 else
-  echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO."
+  echo "Error: neither xorriso nor mkisofs nor genisoimage available - can not create ISO." >&2
   exit 1
 fi
 
 if ! which isohybrid >/dev/null 2>&1 ; then
-  echo "Error: isohybrid executable not found (install syslinux?)." >&2
+  echo "Error: isohybrid executable not found (install syslinux/isolinux/syslinux-utils?)." >&2
   exit 1
 fi
 # }}}
@@ -179,6 +182,7 @@ Options:
 # efi boot {{{
   # default, independent of UEFI support
   BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
+  UEFI_ENABLE=false
 
   case "$MKISOFS" in
     xorriso*)
@@ -187,15 +191,20 @@ Options:
         echo "Disabling (U)EFI boot support since xorriso version is not recent enough."
       else
         echo "xorriso with -eltorito-alt-boot support present"
+        UEFI_ENABLE=true
 
         if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then
-          echo "File /boot/efi.img not found, not extending boot arguments for (U)EFI boot."
+          echo "Warning: File /boot/efi.img not found, not extending boot arguments for (U)EFI boot."
+          UEFI_ENABLE=false
         else
           echo "/boot/efi.img found, extending boot arguments for (U)EFI boot."
           BOOT_ARGS="$BOOT_ARGS -boot-info-table -eltorito-alt-boot -e boot/efi.img -no-emul-boot"
         fi
       fi
       ;;
+    *)
+      echo "Using $MKISOFS for ISO generation (lacking UEFI option), disabling (U)EFI boot support."
+      ;;
   esac
 # }}}
 
@@ -275,11 +284,15 @@ Options:
 # }}}
 
 # make ISO dd-able {{{
-  if isohybrid --help | grep -q -- --uefi ; then
-    echo "isohybrid version supports --uefi option, enabling"
-    ISOHYBRID_OPTIONS=--uefi
- else
-    echo "isohybrid version does NOT support --uefi option, disabling"
+  if ! $UEFI_ENABLE ; then
+    echo "Skipping check for --uefi option in isohybrid since prerequisites are not fulfilled."
+  else
+    if ! isohybrid --help | grep -q -- --uefi ; then
+      echo "isohybrid version does NOT support --uefi option, disabling"
+    else
+      echo "isohybrid version supports --uefi option"
+      ISOHYBRID_OPTIONS=--uefi
+    fi
   fi
 
   echo "Creating dd-able ISO using isohybrid"
@@ -310,4 +323,4 @@ URI: $URI
 # }}}
 
 ## EOF #########################################################################
-# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=3
+# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=2