From: Harald Hoyer Date: Wed, 9 May 2012 09:42:39 +0000 (+0200) Subject: base/init.sh: set DRACUT_QUIET only in dracut-lib.sh X-Git-Tag: 019~74 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cad10a7f8043752bb0c8d411ee7a30c641d6622c;p=thirdparty%2Fdracut.git base/init.sh: set DRACUT_QUIET only in dracut-lib.sh --- diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh index ddb695497..e46e456de 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -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 } diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh index cba2e1abf..5807b1265 100755 --- a/modules.d/99base/init.sh +++ b/modules.d/99base/init.sh @@ -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