Support mkisofs or genisoimage in grml2iso. Updated debian/control

diff --git a/debian/control b/debian/control
index 4cbb936..66fbcc3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.grml.org/?p=grml2usb.git
 Package: grml2usb
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, syslinux | grub2 | grub, python, rsync, mtools
 Package: grml2usb
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, syslinux | grub2 | grub, python, rsync, mtools

-Recommends: syslinux
+Recommends: syslinux, mkisofs | genisoimage

 Description: install grml system / ISO to usb device
  This script installs a grml ISO to an USB device to be able
  to boot from it.  Make sure you have at least one grml ISO
 Description: install grml system / ISO to usb device
  This script installs a grml ISO to an USB device to be able
  to boot from it.  Make sure you have at least one grml ISO

diff --git a/grml2iso b/grml2iso
index 10f270c..8e4e06a 100755 (executable)
--- a/grml2iso
+++ b/grml2iso
@@ -23,6 +23,15 @@
   [ -n "$GRML2USB" ] || GRML2USB='grml2usb'
 # work directory for creating the filesystem
   [ -n "$WRKDIR" ]   || WRKDIR='/tmp/grml2iso.tmp'
   [ -n "$GRML2USB" ] || GRML2USB='grml2usb'
 # 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
+fi

 # }}}
 
 # helper stuff {{{
 # }}}
 
 # helper stuff {{{


@@ -124,7 +133,7 @@ Options:
 # }}}
 
 # generate the CD/DVD ISO {{{
 # }}}
 
 # generate the CD/DVD ISO {{{

-  mkisofs -V 'grml-multiboot' -l -r -J -no-pad \
+  $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 \
     -o "$ISOFILE" .
     -no-emul-boot -boot-load-size 4 -boot-info-table \
     -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
     -o "$ISOFILE" .