X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=remaster%2Fgrml-live-remaster;fp=remaster%2Fgrml-live-remaster;h=69b8f0415f4ef4bd4320e10e6b6f08866fbebb3a;hp=a340592d3cc84f9791136d2f42a8182e2060ff58;hb=acf4086ed360957a304bf6828510f41dd579c4d9;hpb=5cb998f9f7c9a87a04c276e5c1bb2b78530d3250

diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster
index a340592..69b8f04 100755
--- a/remaster/grml-live-remaster
+++ b/remaster/grml-live-remaster
@@ -30,7 +30,19 @@ GRML_LIVE_EDITOR=${VISUAL:-${EDITOR:-vi}}
 # }}}
 
 # make sure we have what we need {{{
-check4progs mkisofs mksquashfs stat || exit 1
+check4progs mkisofs 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
+    MKSQUASHFS=mksquashfs
+  else
+    echo "Error: neither mksquashfs-lzma nor mksquashfs present. Exiting."
+    exit 1
+  fi
+fi
 check4root || exit 1
 # }}}
 
@@ -107,7 +119,7 @@ sed 3,4d "${BOOTSTUFF}"/boot.msg \
 sed 1,2d /remaster/msg >>/remaster/iso/boot/isolinux/boot.msg
 
 mkdir /remaster/iso/live
-mksquashfs /remaster/chroot /remaster/iso/live/"$(basename $SQUASHFS_FILE)"
+$MKSQUASHFS /remaster/chroot /remaster/iso/live/"$(basename $SQUASHFS_FILE)"
 umount /remaster/chroot /remaster/cdrom
 
 if [ -f /remaster/iso/boot/isolinux/isolinux.bin ] ; then