From: Harald Hoyer <harald@redhat.com>
Date: Tue, 12 Jan 2010 09:37:27 +0000 (+0100)
Subject: dracut-lib: prevent double log output
X-Git-Tag: 004~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=695de8493df6efae19c8e8ec37c76bdb35f2191c;p=thirdparty%2Fdracut.git

dracut-lib: prevent double log output
---

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 804df0ca9..faf3c0ae8 100644
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -80,17 +80,23 @@ die() {
     exit 1
 }
 
+check_quiet() {
+    if [ -z "$DRACUT_QUIET" ]; then
+	DRACUT_QUIET="yes"
+	getarg rdinfo && DRACUT_QUIET="no"
+	getarg quiet || DRACUT_QUIET="yes"
+    fi
+}
+
 warn() {
+    check_quiet
     echo "<4>dracut Warning: $@" > /dev/kmsg
-    echo "dracut Warning: $@" >&2
+    [ "$DRACUT_QUIET" != "yes" ] && \
+    	echo "dracut Warning: $@" >&2
 }
 
 info() {
-    if [ -z "$DRACUT_QUIET" ]; then
-	DRACUT_QUIET="no"
-	getarg quiet && DRACUT_QUIET="yes"
-	getarg rdinfo && DRACUT_QUIET="no"
-    fi
+    check_quiet
     echo "<6>dracut: $@" > /dev/kmsg
     [ "$DRACUT_QUIET" != "yes" ] && \
 	echo "dracut: $@"