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

[Petter Reinholdtsen]

Author: pere
Date: 2010-03-20 09:34:16 +0000 (Sat, 20 Mar 2010)
New Revision: 1831

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh
Log:
Only use /proc/cmdline to override VERBOSE setting during boot if
it is readable (Closes: #540008).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2010-03-20 08:48:52 UTC (rev 1830)
+++ sysvinit/trunk/debian/changelog	2010-03-20 09:34:16 UTC (rev 1831)
@@ -4,6 +4,8 @@
   * 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).
+  * Only use /proc/cmdline to override VERBOSE setting during boot if
+    it is readable (Closes: #540008).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 25 Oct 2009 22:32:18 +0100
 

Modified: sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh
===================================================================
--- sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh	2010-03-20 08:48:52 UTC (rev 1830)
+++ sysvinit/trunk/debian/src/initscripts/lib/init/vars.sh	2010-03-20 09:34:16 UTC (rev 1831)
@@ -16,7 +16,7 @@
 # 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
+    if [ -r /proc/cmdline ] && egrep -qw 'quiet' /proc/cmdline ; then
        VERBOSE="no"
     fi
 fi