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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-08 11:15:46 +0000 (Fri, 08 Sep 2006)
New Revision: 867

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
Log:
  * Teach init.d/stop-bootlogd-single to accept the kernel arguments 'S' as
    well as 'single' as single-user mode triggers. (Closes: #372669)
  * Let stop-bootlogd-single depend on $all, to get it last in the rcS.d/
    sequence.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-08 10:35:23 UTC (rev 866)
+++ sysvinit/trunk/debian/changelog	2006-09-08 11:15:46 UTC (rev 867)
@@ -21,6 +21,10 @@
     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)
+  * Let stop-bootlogd-single depend on $all, to get it last in the rcS.d/
+    sequence.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu,  7 Sep 2006 15:41:23 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-09-08 10:35:23 UTC (rev 866)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2006-09-08 11:15:46 UTC (rev 867)
@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          stop-bootlogd-single
-# Required-Start:    $remote_fs
+# Required-Start:    $remote_fs $all
 # Required-Stop:
 # Default-Start:     S
 # Default-Stop:
@@ -17,7 +17,7 @@
 
 case "$1" in
   start)
-	if [ ! -e /proc/cmdline ] || grep -q '\<single\>' /proc/cmdline
+	if [ ! -e /proc/cmdline ] || egrep -qw 'S|single' /proc/cmdline
 	then
 		/etc/init.d/bootlogd stop
 	fi