X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=remaster%2Fgrml-live-remaster;h=57129d392af0752db842169ea812afdf5bdceb7f;hp=92ef074787923fea190bc082637be41d344ad7a7;hb=5081cf1b791e981312b023878237cbd9efc264bc;hpb=f56cc0dac55553cae20708f122a247af787e8af5

diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster
index 92ef074..57129d3 100755
--- a/remaster/grml-live-remaster
+++ b/remaster/grml-live-remaster
@@ -41,16 +41,27 @@ if ! isgrmlcd ; then
 fi
 
 # make sure we have what we need {{{
-check4progs mkisofs stat || exit 1
+if check4progs mkisofs >/dev/null 2>&1 ; then
+  MKISO=mkisofs
+fi
+
+if check4progs genisoimage >/dev/null 2>&1 ; then
+  MKISO=genisoimage
+fi
+
+if [ -z "$MKISO" ] ; then
+  echo "Error: neither mkisofs nor genisoimage available. Exiting." >&2
+  exit 1
+fi
+
+check4progs stat || exit 1
 
 # allow overriding via environment:
 if [ -z "$MKSQUASHFS" ] ; then
-  if which mksquashfs-lzma >/dev/null 2>&1 ; then
-    MKSQUASHFS=mksquashfs-lzma
-  elif which mksquashfs >/dev/null 2>&1 ; then
+  if which mksquashfs >/dev/null 2>&1 ; then
     MKSQUASHFS=mksquashfs
   else
-    echo "Error: neither mksquashfs-lzma nor mksquashfs present. Exiting."
+    echo "Error: mksquashfs is not available. Exiting." >&2
     exit 1
   fi
 fi
@@ -141,7 +152,7 @@ else
    ISOLINUX_BOOTCAT=boot.cat
 fi
 
-mkisofs -b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
+$MKISO -b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
         -boot-info-table -boot-load-size 4 -no-pad \
         -l -r -J -o "$1" /remaster/iso
 # pad for partition table