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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-12-02 13:12:22 +0000 (Fri, 02 Dec 2005)
New Revision: 355

Added:
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/conffiles
   sysvinit/trunk/debian/initscripts/postinst
Log:
Stop bootlogd when booting in "single" mode

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-12-02 11:50:52 UTC (rev 354)
+++ sysvinit/trunk/debian/changelog	2005-12-02 13:12:22 UTC (rev 355)
@@ -37,6 +37,8 @@
     (Closes: #328582, hopefully without reopening #84782)
   * Make stop-bootlogd a distinct script rather than a symlink to bootlogd.
     Give it a different LSB header.
+  * Add stop-bootlogd-single initscript to stop bootlogd in "single" mode
+    (Closes: #213028, #220025)
   * checkfs.sh: Implement FSCKTYPES  (Closes: #89481)  Set, e.g.,
     FSCKTYPES="ext2,msdos" to fsck only file system types ext2 and msdos
     See fsck(8) for syntax.  FSCKTYPES="none" disables fsck of file

Modified: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles	2005-12-02 11:50:52 UTC (rev 354)
+++ sysvinit/trunk/debian/initscripts/conffiles	2005-12-02 13:12:22 UTC (rev 355)
@@ -1,6 +1,7 @@
 /etc/init.d/bootclean.sh
 /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

Added: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2005-12-02 11:50:52 UTC (rev 354)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single	2005-12-02 13:12:22 UTC (rev 355)
@@ -0,0 +1,33 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          stop-bootlogd-single
+# Required-Start:    $remote_fs
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Stop bootlogd in single user mode
+# Description:       See the bootlogd script
+### END INIT INFO
+
+NAME=stop-bootlogd-single
+DAEMON=/sbin/bootlogd
+
+[ -x "$DAEMON" ] || exit 0
+
+case "$1" in
+  start)
+	if [ ! -e /proc/cmdline ] || grep -q '\<single\>' /proc/cmdline
+	then
+		/etc/init.d/bootlogd stop
+	fi
+	;;
+  stop|restart|force-reload)
+	# No-op
+	;;
+  *)
+	echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+exit 0


Property changes on: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd-single
___________________________________________________________________
Name: svn:executable
   + *

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2005-12-02 11:50:52 UTC (rev 354)
+++ sysvinit/trunk/debian/initscripts/postinst	2005-12-02 13:12:22 UTC (rev 355)
@@ -146,16 +146,17 @@
 #
 # Links in runlevels other than S
 #
-updatercd sendsigs      start 20 0 6 .
-updatercd umountnfs.sh  start 31 0 6 .
-updatercd umountfs      start 40 0 6 .
-updatercd umountroot    start 60 0 6 .
-updatercd halt          start 90 0 .
-updatercd reboot        start 90 6 .
-updatercd killprocs     start 30 1 .
-updatercd single        start 90 1 .
-updatercd rmnologin     start 99 2 3 4 5 .
-updatercd stop-bootlogd start 99 2 3 4 5 .
+updatercd sendsigs               start 20 0 6 .
+updatercd umountnfs.sh           start 31 0 6 .
+updatercd umountfs               start 40 0 6 .
+updatercd umountroot             start 60 0 6 .
+updatercd halt                   start 90 0 .
+updatercd reboot                 start 90 6 .
+updatercd killprocs              start 30 1 .
+updatercd single                 start 90 1 .
+updatercd rmnologin              start 99 2 3 4 5 .
+updatercd stop-bootlogd-single   start 99 S .
+updatercd stop-bootlogd          start 99 2 3 4 5 .
 
 #
 # Remove scripts that were left behind by older glibc (<< 2.3.2.ds1-12)