add support for genisoimage

diff --git a/debian/changelog b/debian/changelog
index cec4fbe..1b0eb15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,9 @@ grml-live (0.9.20) UNRELEASED; urgency=low
     also when updating the chroot (this happens if we have a base.tgz available
     on fresh installations).
   * Document usage of STOP_ON_ERROR in /etc/grml/fai/fai.conf.
+  * Really add support for genisoimage (thanks for the bugreport, Worf).
 
- -- Michael Prokop <mika@grml.org>  Mon, 03 Aug 2009 22:55:21 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 03 Aug 2009 23:06:59 +0200
 
 grml-live (0.9.19) unstable; urgency=low
 

diff --git a/grml-live b/grml-live
index 716fc35..4059843 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -764,6 +764,18 @@ elif [ "$BOOT_METHOD" = "grub" ] ; then
 fi
 
 if [ -f "${ISO_OUTPUT}/${ISO_NAME}" -a -z "$UPDATE" -a -z "$BUILD_ONLY" -a -z "$BUILD_DIRTY" ] ; then
+
+   # 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
+      log "Sorry, neither mkisofs nor genisoimage available - can not create ISO."
+      eerror "Sorry, neither mkisofs nor genisoimage available - can not create ISO." ; eend 1
+      bailout
+   fi
+
    log "$ISO_OUTPUT exists already, skipping stage 'iso build'"
    ewarn "$ISO_OUTPUT exists already, skipping stage 'iso build'" ; eend 0
 else
@@ -771,8 +783,8 @@ else
 
    CURRENT_DIR=$(pwd)
    if cd "$BUILD_OUTPUT" ; then
-      log "mkisofs -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
-      mkisofs -V "${GRML_NAME} ${VERSION}" -publisher 'grml-live | grml.org' \
+      log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table -b $BOOT_FILE -o ${ISO_OUTPUT}/${ISO_NAME} ."
+      $MKISOFS -V "${GRML_NAME} ${VERSION}" -publisher 'grml-live | grml.org' \
               -l -r -J -no-emul-boot -boot-load-size 4 -boot-info-table    \
               -b $BOOT_FILE -no-pad \
               -o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?