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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-08 11:26:39 +0000 (Fri, 08 Sep 2006)
New Revision: 868

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
Log:
Accepting '1' to trigger single-user will close another bug.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-08 11:15:46 UTC (rev 867)
+++ sysvinit/trunk/debian/changelog	2006-09-08 11:26:39 UTC (rev 868)
@@ -21,8 +21,9 @@
     symlinks.  Patch from Arjan Oosting. (Closes: #386500)
   * Remove 'S' from default-stop in skeleton.  It never make sense to add
     stop links in rcS.d/.
-  * Teach init.d/stop-bootlogd-single to accept the kernel arguments 'S' as
-    well as 'single' as single-user mode triggers. (Closes: #372669)
+  * Teach init.d/stop-bootlogd-single to accept the kernel arguments
+    'S' and '1' as well as 'single' as single-user mode triggers.
+    (Closes: #367465, #372669)
   * Let stop-bootlogd-single depend on $all, to get it last in the rcS.d/
     sequence.
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-09-08 11:15:46 UTC (rev 867)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-09-08 11:26:39 UTC (rev 868)
@@ -17,7 +17,7 @@
 
 case "$1" in
   start)
-	if [ ! -e /proc/cmdline ] || egrep -qw 'S|single' /proc/cmdline
+	if [ ! -e /proc/cmdline ] || egrep -qw 'S|single|1' /proc/cmdline
 	then
 		/etc/init.d/bootlogd stop
 	fi