[Pkg-sysvinit-commits] r1829 - in sysvinit/trunk/debian: . src/initscripts/lib/init

[Petter Reinholdtsen]

Author: pere
Date: 2010-03-20 08:48:04 +0000 (Sat, 20 Mar 2010)
New Revision: 1829

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh
Log:
Only override VERBOSE in /lib/init/vars.sh based on kernel
argument when called from /etc/init.d/rc (Closes: #505468).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-03-20 08:36:44 UTC (rev 1828)
+++ sysvinit/trunk/debian/changelog	2010-03-20 08:48:04 UTC (rev 1829)
@@ -2,6 +2,8 @@
 
   [ Petter Reinholdtsen ]
   * Correct typo preventing sysv-rc error messages to be sent to stderr.
+  * Only override VERBOSE in /lib/init/vars.sh based on kernel
+    argument when called from /etc/init.d/rc (Closes: #505468).
   * Debconf translations:
     - Added German from Chris Leick (Closes: #550829).
     - Added Russian from Yuri Kozlov (Closes: #552415).

Modified: sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh	2010-03-20 08:36:44 UTC (rev 1828)
+++ sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh	2010-03-20 08:48:04 UTC (rev 1829)
@@ -12,9 +12,13 @@
     NOSWAP=no
 fi
 
-# Accept the same 'quiet' option as the kernel
-if [ ! -e /proc/cmdline ] || egrep -qw 'quiet' /proc/cmdline ; then
-    VERBOSE="no"
+# Accept the same 'quiet' option as the kernel, but only during boot
+# and shutdown.  Only use this rule when the variables set by
+# init.d/rc is present.
+if [ "$RUNLEVEL" ] && [ "$PREVLEVEL" ] ; then
+    if [ ! -e /proc/cmdline ] || egrep -qw 'quiet' /proc/cmdline ; then
+       VERBOSE="no"
+    fi
 fi
 
 # But allow both rcS and the kernel options 'quiet' to be overrided