X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=d8f4be51cf184f6c88892e413f5a86284eb264c2;hp=45569179ee1e529f80c71e29457a26b6dd517ae4;hb=1d43bf36feeef95f29f8e34f22cc7c72b2447604;hpb=20752e3676639470fa48c6d346c91dd16a03c946

diff --git a/grml2iso b/grml2iso
index 4556917..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,7 +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=true
+  UEFI_ENABLE=false
 
   case "$MKISOFS" in
     xorriso*)
@@ -188,6 +191,7 @@ 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 "Warning: File /boot/efi.img not found, not extending boot arguments for (U)EFI boot."
@@ -199,10 +203,7 @@ Options:
       fi
       ;;
     *)
-      if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then
-        echo "Warning: File /boot/efi.img not found."
-        UEFI_ENABLE=false
-      fi
+      echo "Using $MKISOFS for ISO generation (lacking UEFI option), disabling (U)EFI boot support."
       ;;
   esac
 # }}}
@@ -284,7 +285,7 @@ Options:
 
 # make ISO dd-able {{{
   if ! $UEFI_ENABLE ; then
-    echo "Skipping check for --uefi option in isohybrid since /boot/efi.img does not exist."
+    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"
@@ -292,10 +293,10 @@ Options:
       echo "isohybrid version supports --uefi option"
       ISOHYBRID_OPTIONS=--uefi
     fi
-
-    echo "Creating dd-able ISO using isohybrid"
-    isohybrid $ISOHYBRID_OPTIONS "$ISOFILE"
   fi
+
+  echo "Creating dd-able ISO using isohybrid"
+  isohybrid $ISOHYBRID_OPTIONS "$ISOFILE"
 # }}}
 
 # cleanup {{{