grml2iso: make ISOs dd-able through isohybrid

[grml2usb.git] / grml2iso

diff --git a/grml2iso b/grml2iso
index dc23036..1dd2f6a 100755 (executable)
--- a/grml2iso
+++ b/grml2iso
@@ -19,6 +19,7 @@
 # path to the grml2usb script you'd like to use
   [ -n "$GRML2USB" ] || GRML2USB='grml2usb'
 # work directory for creating the filesystem
+  [ -n "$TMPDIR" ]   && WRKDIR="${TMPDIR}/grml2iso.tmp"
   [ -n "$WRKDIR" ]   || WRKDIR='/tmp/grml2iso.tmp'
 # support mkisofs as well as genisoimage
 if which xorriso >/dev/null 2>&1 ; then
@@ -31,6 +32,11 @@ else
   echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO."
   exit 1
 fi
+
+if ! which isohybrid >/dev/null 2>&1 ; then
+  echo "Error: isohybrid executable not found (install syslinux?)." >&2
+  exit 1
+fi
 # }}}
 
 # helper stuff {{{
@@ -44,7 +50,7 @@ Options:
      -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.
+                         Can be specified 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.
@@ -53,6 +59,8 @@ Options:
                          file from the specified URI. Please note that due to
                          restrictions in the bootprocess only IPs are allowed.
                          Supported protocols are: http and ftp
+     -t Directory        Directory that should be used for temporary files
+                         during build. Defaults to /tmp/grml2iso.tmp if unset.
 
      Examples:
      $0 -s http://192.168.23.42:8000/grml/ -o small.iso grml64_2010.12.iso
@@ -74,7 +82,7 @@ Options:
   FORCE=''
   URI=''
   typeset -a GRML2USB_OPTS
-  while getopts fb:c:o:r:p:s: name; do
+  while getopts fb:c:o:r:p:s:t: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
       b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
@@ -83,6 +91,7 @@ Options:
       r)   GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
       p)   GRML2USB_OPTS+=("$OPTARG");;
       s)   URI="$OPTARG";;
+      t)   WRKDIR="$OPTARG";;
       ?)   usage 2;;
     esac
   done
@@ -91,6 +100,10 @@ Options:
     GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
   fi
 
+  if [ -n "$WRKDIR" ] ; then
+    GRML2USB_OPTS+=(--tmpdir="$WRKDIR")
+  fi
+
 # make sure -o is specified
   [ -n "$ISOFILE" ] || usage 1
 
@@ -253,6 +266,18 @@ Options:
   dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null
 # }}}
 
+# 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"
+  fi
+
+  echo "Creating dd-able ISO using isohybrid"
+  isohybrid $ISOHYBRID_OPTIONS "$ISOFILE"
+# }}}
+
 # cleanup {{{
   cd "$ORIG_DIR"
   sync