dracut-lib: prevent double log output

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 804df0ca9ac647a06a9a587a4f6fe290d18346fe..faf3c0ae8cd372191040f8bb09e8ebc52734cf56 100644 (file)
--- 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: $@"