base/init.sh: set DRACUT_QUIET only in dracut-lib.sh
authorHarald Hoyer <harald@redhat.com>
Wed, 9 May 2012 09:42:39 +0000 (11:42 +0200)
committerHarald Hoyer <harald@redhat.com>
Wed, 9 May 2012 11:15:32 +0000 (13:15 +0200)
modules.d/99base/dracut-lib.sh
modules.d/99base/init.sh

index ddb6954..e46e456 100755 (executable)
@@ -316,6 +316,9 @@ check_quiet() {
         getargbool 0 rd.info -y rdinfo && DRACUT_QUIET="no"
         getargbool 0 rd.debug -y rdinitdebug && DRACUT_QUIET="no"
         getarg quiet || DRACUT_QUIET="yes"
+        a=$(getarg loglevel=)
+        [ -n "$a" ] && [ $a -ge 28 ] && DRACUT_QUIET="yes"
+        export DRACUT_QUIET
     fi
 }
 
index cba2e1a..5807b12 100755 (executable)
@@ -39,12 +39,6 @@ fi
 
 setdebug
 
-if [ "$RD_DEBUG" = "yes" ]; then
-    getarg quiet && DRACUT_QUIET="yes"
-    a=$(getarg loglevel=)
-    [ -n "$a" ] && [ $a -ge 8 ] && unset DRACUT_QUIET
-fi
-
 if ! ismounted /dev; then
     mount -t devtmpfs -o mode=0755,nosuid,strictatime devtmpfs /dev >/dev/null 
 fi