[Pkg-sysvinit-commits] r305 - sysvinit/trunk/debian/initscripts/etc/init.d

Thomas Hood jdthood-guest at costa.debian.org
Mon Nov 28 07:30:25 UTC 2005


Author: jdthood-guest
Date: 2005-11-28 07:30:24 +0000 (Mon, 28 Nov 2005)
New Revision: 305

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd
   sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd
Log:
Fix bootlogd script

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd	2005-11-27 22:30:41 UTC (rev 304)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootlogd	2005-11-28 07:30:24 UTC (rev 305)
@@ -12,40 +12,39 @@
 #                    starting it even when called with the "start" argument.
 ### END INIT INFO
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
+PATH=/sbin:/bin  # No remote fs at start
 DAEMON=/sbin/bootlogd
 NAME=bootlogd
-DESC="Bootlog daemon"
+DESC="Boot logger"
 [ -r /etc/default/bootlogd ] && . /etc/default/bootlogd
 
 [ -x "$DAEMON" ] || exit 0
 
 . /lib/lsb/init-functions
 
+# Because bootlogd is broken on some systems, we take the special measure
+# of requiring it to be enabled by setting an environment variable.
 case "$BOOTLOGD_ENABLE" in
   [Nn]*)
 	exit 0
 	;;
 esac
 
-# Previously this script was symlinked as "stop-bootlogd" which,
-# when run with the "start" argument, should stop bootlogd.
-# Now stop-bootlogd is a separate script, but for backward compatibility
-# this script must continue to implement the old behavior.
-AM_STOP_BOOTLOGD=
+# Previously this script was symlinked as "stop-bootlogd" which, when run
+# with the "start" argument, should stop bootlogd.  Now stop-bootlogd is
+# a distinct script, but for backward compatibility this script must
+# continue to implement the old behavior.
 SCRIPTNAME=${0##*/}
 SCRIPTNAME=${SCRIPTNAME#[SK]??}
 ACTION="$1"
 case "$0" in
   *stop-bootlog*)
-	AM_STOP_BOOTLOGD=Y
 	[ "$ACTION" = start ] && ACTION=stop
 	;;
 esac
 
 case "$ACTION" in
   start)
-	PATH=/sbin:/bin  # No remote fs at start
 	log_daemon_msg "Starting $DESC" "$NAME"
 	if [ -d /proc/1/. ]
 	then
@@ -62,21 +61,22 @@
   stop)
 	log_daemon_msg "Stopping $DESC" "$NAME"
 	start-stop-daemon --stop --quiet --exec $DAEMON
-	ES=$?
-	if [ "$AM_STOP_BOOTLOGD" ] && [ -f /var/log/boot ] && [ -f /var/log/boot~ ]
+	sleep 1
+	log_end_msg $?
+	if [ -f /var/log/boot ] && [ -f /var/log/boot~ ]
 	then
-		cd /var/log
-		chgrp adm boot
-		savelog -p -c 5 boot > /dev/null 2>&1
-		mv boot.0 boot
+		log_begin_action_msg "Moving boot log file"
+		cd /var/log &&
+		chgrp adm boot &&
+		savelog -p -c 5 boot > /dev/null 2>&1 &&
+		mv boot.0 boot &&
 		mv boot~ boot.0
+		log_end_action_msg $?
 	fi
-	log_end_msg $ES
-	sleep 1
 	;;
   restart|force-reload)
- 	$0 stop
- 	$0 start
+ 	/etc/init.d/bootlogd stop
+ 	/etc/init.d/bootlogd start
 	;;
   *)
 	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd	2005-11-27 22:30:41 UTC (rev 304)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/stop-bootlogd	2005-11-28 07:30:24 UTC (rev 305)
@@ -10,7 +10,10 @@
 ### END INIT INFO
 
 NAME=stop-bootlogd
+DAEMON=/sbin/bootlogd
 
+[ -x "$DAEMON" ] || exit 0
+
 case "$1" in
   start)
 	/etc/init.d/bootlogd stop




More information about the Pkg-sysvinit-commits mailing list