From: Michael Prokop <mika@grml.org>
Date: Fri, 11 Jan 2008 08:14:15 +0000 (+0100)
Subject: Use -no-progress option for mksquashfs only if it's supported
X-Git-Tag: 0.1~1^2~1
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=70d1193b5f554dce691294e5c6715b269a73a925

Use -no-progress option for mksquashfs only if it's supported
---

diff --git a/debian/changelog b/debian/changelog
index c35cb70..0e15fa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ grml-live (0.1) unstable; urgency=low
     remove packages via dpkg instead of apt-get. Thanks for the
     bugreport and the patch, Lupe Christoph! [Closes: issue367]
   * Add SQUASHFS_ZLIB template to grml-live.conf.
+  * Use -no-progress option for mksquashfs only if it's supported.
 
  -- Michael Prokop <mika@grml.org>  Fri, 11 Jan 2008 01:56:01 +0100
 
diff --git a/grml-live b/grml-live
index 76971e3..ab0b1c1 100755
--- a/grml-live
+++ b/grml-live
@@ -547,8 +547,13 @@ else
    [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
 
    # execute squashfs:
-   log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress"
-   mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB
+   if mksquashfs --help 2>&1 | grep -- -no-progress ; then
+      log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress"
+      mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB
+   else
+      log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend"
+      mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend $SQUASHFS_OPTIONS $SQUASHFS_ZLIB
+   fi
    log "Finished execution of stage 'squashfs' [$(date)]"
    einfo "Finished execution of stage 'squashfs'" ; eend 0
 fi