X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=c4c13eeb1ae166c4705444b2c9cd90b0593f5460;hp=379ef68cc4c66e3eb10de9ae6de2ceffced8b4f0;hb=a1ca17bdb73f73e3b8b49dca4bee1da2460db329;hpb=161f2d52971bd95482a797c6011425a6030b5233

diff --git a/grml2iso b/grml2iso
index 379ef68..c4c13ee 100755
--- a/grml2iso
+++ b/grml2iso
@@ -21,13 +21,15 @@
 # work directory for creating the filesystem
   [ -n "$WRKDIR" ]   || WRKDIR='/tmp/grml2iso.tmp'
 # support mkisofs as well as genisoimage
-  if which mkisofs >/dev/null 2>&1; then
-    MKISOFS='mkisofs'
-  elif which genisoimage >/dev/null 2>&1; then
-    MKISOFS='genisoimage'
-  else
-    echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO."
-    exit 1
+if which xorriso >/dev/null 2>&1 ; then
+  MKISOFS='xorriso -as mkisofs'
+elif which mkisofs >/dev/null 2>&1; then
+  MKISOFS='mkisofs'
+elif which genisoimage >/dev/null 2>&1; then
+  MKISOFS='genisoimage'
+else
+  echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO."
+  exit 1
 fi
 # }}}
 
@@ -39,15 +41,15 @@ fi
     echo >&2 "
 Options:
      -b Boot Params      Additional boot parameters passed to grml2usb
-     -c Directory        Copy files from directory to generated iso
+     -c Directory        Copy files from directory to generated ISO
      -f                  Force overwrite of existing target.iso
      -r BootParam        Remove specified boot params.
                          Could be specfied multiple times.
      -p <grml2usb param> Add the specified parameter to the grml2usb
                          commandline. For a list of valid parameters have
                          a look at the grml2usb manpage.
-                         Could be specfied multiple times.
-     -s URI              Generate a small iso file which downloads the squashfs
+                         Can be specified multiple times.
+     -s URI              Generate a small ISO file which downloads the squashfs
                          file from the specified URI. Please note that due to
                          restrictions in the bootprocess only IPs are allowed.
                          Supported protocols are: http and ftp
@@ -56,8 +58,8 @@ Options:
      $0 -s http://192.168.23.42:8000/grml/ -o small.iso grml64_2010.12.iso
 
      Will generate a file small.iso which tries to download the squashfs file from
-     http://192.168.23.42:8000/grml/ The squashfs file is located in the output
-     directory as the iso file.
+     http://192.168.23.42:8000/grml/ - the squashfs file is placed in the same
+     output directory as the ISO file.
 "
     [ -n "$1" ] && exit $1 || exit 1
   }
@@ -112,7 +114,7 @@ Options:
 # }}}
 
 # check for grml2usb {{{
-  if [ ! -x "$(which $GRML2USB)" ] || [ ! -x "$GRML2USB" ] ; then
+  if [ ! -x "$(which $GRML2USB)" ] && [ ! -x "$GRML2USB" ] ; then
     echo >&2 "Error: Could not find grml2usb"
     if [ -x "./$GRML2USB" ] ; then
       echo >&2 "If you executed grml2iso from the grml2usb repository use"
@@ -124,8 +126,6 @@ Options:
 
 # variables {{{
   ORIG_DIR="$(pwd)"
-  # note: grub-pc_1.96+20090603-1 seems to be b0rken
-  GRUB_VERSION="grub-pc_1.96+20080724-16"
 
 # normalise path
   case $ISOFILE in
@@ -147,7 +147,6 @@ Options:
   $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir"
 # }}}
 
-
 # move syslinux to isolinux {{{
   mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
 
@@ -156,7 +155,30 @@ Options:
   echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg
 # }}}
 
-# adjust iso for small output if necessary [{{
+# 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"
+
+  case "$MKISOFS" in
+    xorriso*)
+      echo "Using xorriso for ISO generation."
+      if ! dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-1 ; then
+        echo "Disabling (U)EFI boot support since xorriso version is not recent enough."
+      else
+        echo "xorriso with -eltorito-alt-boot support present"
+
+        if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then
+          echo "File /boot/efi.img not found, not extending boot arguments for (U)EFI boot."
+        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
+      ;;
+  esac
+# }}}
+
+# adjust ISO for small output if necessary {{{
   if [ -n "$URI" ] ; then
      bootloader_files=$(find . -name "*.cfg" -type f)
      bootloader_files+=" "
@@ -180,16 +202,14 @@ Options:
 
 # copy specified directory to cd {{{
   if [ -n "$DIR" ] ; then
-     echo >&2 "Copying ${DIR} to generated iso"
+     echo >&2 "Copying ${DIR} to generated ISO"
      rsync -a ${DIR}/ .
   fi
 
 # }}}
 
 # generate the CD/DVD ISO {{{
-  $MKISOFS -V 'grml-multiboot' -l -r -J -no-pad \
-    -no-emul-boot -boot-load-size 4 -boot-info-table \
-    -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
+  $MKISOFS -V 'grml-multiboot' -l -r -J -no-pad $BOOT_ARGS \
     -o "$ISOFILE" .
 # }}}
 
@@ -200,7 +220,6 @@ Options:
   dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null
 # }}}
 
-
 # cleanup {{{
   cd "$ORIG_DIR"
   sync
@@ -211,9 +230,9 @@ Options:
      echo "
 Information:
 ==============
-You requested to generate a small iso image. Your generated
-iso image $ISOFILE does _not_ contain the squashfs files from
-the source iso images.
+You requested to generate a small ISO image. Your generated
+ISO image $ISOFILE does _not_ contain the squashfs files from
+the source ISO images.
 
 You have to provide the extracted squashfs files under $URI.