From: Michael Prokop <devnull@localhost>
Date: Mon, 21 Jan 2008 18:57:48 +0000 (+0100)
Subject: Grep using the quiet option for squashfs features
X-Git-Tag: 0.2~7
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=8f6ab7afaa3c1f544485be8a667b4bdb50d4e67b

Grep using the quiet option for squashfs features
---

diff --git a/debian/changelog b/debian/changelog
index aa5d50e..4b6b44b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ grml-live (0.2) unstable; urgency=low
     for providing default /etc/default/loadcpufreq configuration.
   * Move sourcing /etc/grml/grml-live.local *before* the cmdline
     option parsing so we can override already set defaults interative.
+  * Grep using the quiet option for squashfs features.
 
  -- Michael Prokop <mika@grml.org>  Mon, 14 Jan 2008 22:54:10 +0100
 
diff --git a/grml-live b/grml-live
index 4e13d6c..534b809 100755
--- a/grml-live
+++ b/grml-live
@@ -546,7 +546,7 @@ else
    [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
 
    # execute squashfs:
-   if mksquashfs --help 2>&1 | grep -- -no-progress ; then
+   if mksquashfs --help 2>&1 | grep -q -- -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