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

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-01 16:38:25 +0000 (Tue, 01 Jan 2008)
New Revision: 1172

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/conffiles
   sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
   sysvinit/trunk/debian/initscripts/postinst
Log:
Revert single user boot log change.  Single user is not runlevel 1 in Debian.  It just pretends to be.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-01 15:57:21 UTC (rev 1171)
+++ sysvinit/trunk/debian/changelog	2008-01-01 16:38:25 UTC (rev 1172)
@@ -9,9 +9,6 @@
     order in the boot.
   * Removed stop dependencies for bootmisc.sh.  Its stop operation is
     a no-op, and it is not run in any level to stop.
-  * Moved the stop-bootlogd-single script from rcS.d/ to rc1.d, just
-    before killprocs.  Let killprocs list is as a start dependency.
-    Simplify script as it is only executed in single user now.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 31 Dec 2007 12:18:42 +0100
 

Modified: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles	2008-01-01 15:57:21 UTC (rev 1171)
+++ sysvinit/trunk/debian/initscripts/conffiles	2008-01-01 16:38:25 UTC (rev 1172)
@@ -1,5 +1,6 @@
 /etc/init.d/bootlogd
 /etc/init.d/stop-bootlogd
+/etc/init.d/stop-bootlogd-single
 /etc/init.d/bootmisc.sh
 /etc/init.d/checkfs.sh
 /etc/init.d/checkroot.sh

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/killprocs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/killprocs	2008-01-01 15:57:21 UTC (rev 1171)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/killprocs	2008-01-01 16:38:25 UTC (rev 1172)
@@ -1,7 +1,7 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          killprocs
-# Required-Start:    $local_fs stop-bootlogd-single
+# Required-Start:    $local_fs
 # Required-Stop:
 # Default-Start:     1
 # Default-Stop:

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2008-01-01 15:57:21 UTC (rev 1171)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2008-01-01 16:38:25 UTC (rev 1172)
@@ -1,14 +1,15 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          stop-bootlogd-single
-# Required-Start:    $remote_fs
+# Required-Start:    $remote_fs $all
 # Required-Stop:
-# Default-Start:     1
+# Default-Start:     S
 # Default-Stop:
 # Short-Description: Stop bootlogd in single user mode
 # Description:       See the bootlogd script
 ### END INIT INFO
 
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=stop-bootlogd-single
 DAEMON=/sbin/bootlogd
 
@@ -16,7 +17,17 @@
 
 case "$1" in
   start)
-	/etc/init.d/bootlogd stop
+	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
 	;;
   stop|restart|force-reload)
 	# No-op

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2008-01-01 15:57:21 UTC (rev 1171)
+++ sysvinit/trunk/debian/initscripts/postinst	2008-01-01 16:38:25 UTC (rev 1172)
@@ -108,15 +108,6 @@
 fi
 
 #
-# In 2.86.ds1-48 the "stop-bootlogd-single" script were moved from
-# rcS.d to rc1.d.
-#
-if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-48"
-then
-	update-rc.d -f stop-bootlogd-single remove >/dev/null 2>&1 || :
-fi
-
-#
 # Okay, we could do this with update-rc.d, but that would probably
 # be pretty slow. This way we win some speed.
 # DO NOT FOLLOW THIS EXAMPLE IN OTHER PACKAGES.
@@ -147,11 +138,11 @@
 updatercd umountnfs.sh           start 31 0 6 .
 updatercd sendsigs               start 20 0 6 .
 
-updatercd stop-bootlogd-single   start 29 1 .
 updatercd killprocs              start 30 1 .
 updatercd single                 start 90 1 .
 updatercd rc.local               start 99 2 3 4 5 .
 updatercd rmnologin              start 99 2 3 4 5 .
+updatercd stop-bootlogd-single   start 99 S .
 updatercd stop-bootlogd          start 99 2 3 4 5 .
 
 #