[Pkg-sysvinit-commits] r1002 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-02 17:44:56 +0000 (Mon, 02 Oct 2006)
New Revision: 1002

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
Log:
  * Correct code detecting single-user in stop-bootlog-single to only
    trigger on '1' as single work and not as option argument. (Closes:
    #390572, #387340)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-02 09:20:53 UTC (rev 1001)
+++ sysvinit/trunk/debian/changelog	2006-10-02 17:44:56 UTC (rev 1002)
@@ -2,6 +2,9 @@
 
   * Fix calls to fuser in umountnfs.sh.  Thanks to Frank Mehnert for the
     tip.
+  * Correct code detecting single-user in stop-bootlog-single to only
+    trigger on '1' as single work and not as option argument. (Closes:
+    #390572, #387340)
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon,  2 Oct 2006 11:20:01 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-10-02 09:20:53 UTC (rev 1001)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-10-02 17:44:56 UTC (rev 1002)
@@ -17,8 +17,15 @@
 
 case "$1" in
   start)
-	if [ ! -e /proc/cmdline ] || egrep -qw 'S|single|1' /proc/cmdline
-	then
+	single=false
+	for word in $(cat /proc/cmdline); do
+		case "$word" in
+		S|single|1)
+			single=true
+		;;
+		esac
+	done
+	if [ true = "$single" ] ; then
 		/etc/init.d/bootlogd stop
 	fi
 	;;