retitle 545181 Please split bootlogd into a separate package
tags 545181 + patch
thanks
The attached patch splits bootlogd into a separate package.
At the risk of conflicts, I've included a debian/changelog stanza. I've
also included an appropriate NEWS.Debian warning about the transition.
For the changes, I tried to match the existing style as closely as
possible, rather than using debhelper bits that the sysvinit package
doesn't already use.
Please consider applying this patch.
Thanks,
Josh Triplett
diff -Naur -x .svn sysvinit.orig/debian/bootlogd.install sysvinit/debian/bootlogd.install
--- sysvinit.orig/debian/bootlogd.install 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/bootlogd.install 2011-10-09 01:20:28.107324190 -0700
@@ -0,0 +1,2 @@
+sbin/bootlogd
+usr/share/man/man8/bootlogd.8
diff -Naur -x .svn sysvinit.orig/debian/bootlogd.lintian-overrides sysvinit/debian/bootlogd.lintian-overrides
--- sysvinit.orig/debian/bootlogd.lintian-overrides 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/bootlogd.lintian-overrides 2011-10-09 01:31:25.915744185 -0700
@@ -0,0 +1,2 @@
+bootlogd: script-calls-init-script-directly ./etc/init.d/stop-bootlogd:19
+bootlogd: script-calls-init-script-directly ./etc/init.d/stop-bootlogd-single:36
diff -Naur -x .svn sysvinit.orig/debian/bootlogd.postinst sysvinit/debian/bootlogd.postinst
--- sysvinit.orig/debian/bootlogd.postinst 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/bootlogd.postinst 2011-10-09 01:41:11.265022310 -0700
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+update-rc.d bootlogd start 05 S . >/dev/null || exit $?
+update-rc.d stop-bootlogd-single start 99 S . >/dev/null || exit $?
+update-rc.d stop-bootlogd start 99 2 3 4 5 . >/dev/null || exit $?
+
+#DEBHELPER#
diff -Naur -x .svn sysvinit.orig/debian/bootlogd.postrm sysvinit/debian/bootlogd.postrm
--- sysvinit.orig/debian/bootlogd.postrm 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/bootlogd.postrm 2011-10-09 01:41:44.700639409 -0700
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+ purge)
+ update-rc.d stop-bootlogd remove >/dev/null || exit $?
+ update-rc.d stop-bootlogd-single remove >/dev/null || exit $?
+ update-rc.d bootlogd remove >/dev/null || exit $?
+ ;;
+esac
+
+#DEBHELPER#
diff -Naur -x .svn sysvinit.orig/debian/changelog sysvinit/debian/changelog
--- sysvinit.orig/debian/changelog 2011-10-09 02:38:10.112282780 -0700
+++ sysvinit/debian/changelog 2011-10-09 01:10:21.193688945 -0700
@@ -1,8 +1,12 @@
sysvinit (2.88dsf-14) UNRELEASED; urgency=low
+ [ Kel Modderman ]
* Add support for s390x, thanks to Aurelien Jarno <aure...@debian.org>.
(Closes: #641107)
+ [ Josh Triplett ]
+ * Split bootlogd into a separate package. (Closes: #545181)
+
-- Kel Modderman <k...@otaku42.de> Sun, 11 Sep 2011 09:39:40 +1000
sysvinit (2.88dsf-13.11) unstable; urgency=low
diff -Naur -x .svn sysvinit.orig/debian/control sysvinit/debian/control
--- sysvinit.orig/debian/control 2011-10-09 02:38:10.100282928 -0700
+++ sysvinit/debian/control 2011-10-09 01:18:49.428360797 -0700
@@ -59,3 +59,13 @@
Description: scripts for initializing and shutting down the system
The scripts in this package initialize a standard Debian
system at boot time and shut it down at halt or reboot time.
+
+Package: bootlogd
+Architecture: any
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14)
+Replaces: sysvinit-utils (<< 2.88dsf-14), initscripts (<< 2.88dsf-14)
+Breaks: sysvinit-utils (<< 2.88dsf-14), initscripts (<< 2.88dsf-14)
+Description: daemon to log boot messages
+ bootlogd logs all messages printed to the system console during system boot,
+ and records those messages to a logfile.
diff -Naur -x .svn sysvinit.orig/debian/initscripts.conffiles sysvinit/debian/initscripts.conffiles
--- sysvinit.orig/debian/initscripts.conffiles 2011-10-09 02:38:10.104282879 -0700
+++ sysvinit/debian/initscripts.conffiles 2011-10-09 01:29:40.116965183 -0700
@@ -1,6 +1,3 @@
-/etc/init.d/bootlogd
-/etc/init.d/stop-bootlogd
-/etc/init.d/stop-bootlogd-single
/etc/init.d/bootlogs
/etc/init.d/bootmisc.sh
/etc/init.d/checkfs.sh
@@ -25,7 +22,6 @@
/etc/init.d/umountnfs.sh
/etc/init.d/umountroot
/etc/init.d/urandom
-/etc/default/bootlogd
/etc/default/devpts
/etc/default/halt
/etc/default/tmpfs
diff -Naur -x .svn sysvinit.orig/debian/initscripts.lintian-overrides sysvinit/debian/initscripts.lintian-overrides
--- sysvinit.orig/debian/initscripts.lintian-overrides 2011-10-09 02:38:10.116282731 -0700
+++ sysvinit/debian/initscripts.lintian-overrides 2011-10-09 01:32:36.962924978 -0700
@@ -5,8 +5,6 @@
initscripts: script-not-executable ./etc/init.d/skeleton
initscripts: script-not-executable ./lib/init/bootclean.sh
initscripts: maintainer-script-calls-init-script-directly postrm:14
-initscripts: script-calls-init-script-directly ./etc/init.d/stop-bootlogd:19
-initscripts: script-calls-init-script-directly ./etc/init.d/stop-bootlogd-single:36
initscripts: script-calls-init-script-directly ./etc/network/if-up.d/mountnfs:102
initscripts: depends-on-essential-package-without-using-version recommends: e2fsprogs
initscripts: no-upstream-changelog
diff -Naur -x .svn sysvinit.orig/debian/initscripts.postinst sysvinit/debian/initscripts.postinst
--- sysvinit.orig/debian/initscripts.postinst 2011-10-09 02:38:10.108282829 -0700
+++ sysvinit/debian/initscripts.postinst 2011-10-09 01:35:01.753258505 -0700
@@ -161,7 +161,6 @@
update-rc.d mountkernfs.sh start 02 S . >/dev/null || exit $?
update-rc.d hostname.sh start 02 S . >/dev/null || exit $?
update-rc.d mountdevsubfs.sh start 04 S . >/dev/null || exit $?
-update-rc.d bootlogd start 05 S . >/dev/null || exit $?
update-rc.d checkroot.sh start 10 S . >/dev/null || exit $?
update-rc.d mtab.sh start 12 S . >/dev/null || exit $?
update-rc.d checkfs.sh start 30 S . >/dev/null || exit $?
@@ -187,8 +186,6 @@
update-rc.d bootlogs start 70 1 2 3 4 5 . >/dev/null || exit $?
update-rc.d rc.local start 99 2 3 4 5 . >/dev/null || exit $?
update-rc.d rmnologin start 99 2 3 4 5 . >/dev/null || exit $?
-update-rc.d stop-bootlogd-single start 99 S . >/dev/null || exit $?
-update-rc.d stop-bootlogd start 99 2 3 4 5 . >/dev/null || exit $?
#
# Remove scripts that were left behind by older glibc (<< 2.3.2.ds1-12)
diff -Naur -x .svn sysvinit.orig/debian/initscripts.postrm sysvinit/debian/initscripts.postrm
--- sysvinit.orig/debian/initscripts.postrm 2011-10-09 02:38:10.112282780 -0700
+++ sysvinit/debian/initscripts.postrm 2011-10-09 01:27:59.362130390 -0700
@@ -14,6 +14,8 @@
rm -f /etc/init.d/bootclean.dpkg-old
rm -f /etc/init.d/bootclean.sh
rm -f /etc/init.d/bootclean.sh.dpkg-old
+ rm -f /etc/default/bootlogd
+ rm -f /etc/default/bootlogd.dpkg-old
#
# Remove configuration files
@@ -46,8 +48,6 @@
# Remove rc symlinks in the reverse dependency order they were
# inserted
- update-rc.d stop-bootlogd remove >/dev/null || exit $?
- update-rc.d stop-bootlogd-single remove >/dev/null || exit $?
update-rc.d rmnologin remove >/dev/null || exit $?
update-rc.d rc.local remove >/dev/null || exit $?
update-rc.d bootlogs remove >/dev/null || exit $?
@@ -69,7 +69,6 @@
update-rc.d checkfs.sh remove >/dev/null || exit $?
update-rc.d mtab.sh remove >/dev/null || exit $?
update-rc.d checkroot.sh remove >/dev/null || exit $?
- update-rc.d bootlogd remove >/dev/null || exit $?
update-rc.d mountdevsubfs.sh remove >/dev/null || exit $?
update-rc.d hostname.sh remove >/dev/null || exit $?
update-rc.d mountkernfs.sh remove >/dev/null || exit $?
diff -Naur -x .svn sysvinit.orig/debian/initscripts.preinst sysvinit/debian/initscripts.preinst
--- sysvinit.orig/debian/initscripts.preinst 2011-10-09 02:38:10.112282780 -0700
+++ sysvinit/debian/initscripts.preinst 2011-10-09 01:40:29.489499737 -0700
@@ -50,6 +50,11 @@
if [ "$2" ] && dpkg --compare-versions "$2" lt "2.86.ds1-54" ; then
eliminate_conffile "/etc/init.d/bootclean"
fi
+ # bootlogd moved to a separate package in 2.88dsf-14, and
+ # /etc/default/bootlogd no longer exists in that package.
+ if [ "$2" ] && dpkg --compare-versions "$2" lt "2.88dsf-14" ; then
+ eliminate_conffile "/etc/default/bootlogd"
+ fi
#
# Move conflicting log _file_ if present
#
diff -Naur -x .svn sysvinit.orig/debian/rules sysvinit/debian/rules
--- sysvinit.orig/debian/rules 2011-10-09 02:38:10.112282780 -0700
+++ sysvinit/debian/rules 2011-10-09 02:18:41.810629171 -0700
@@ -14,6 +14,7 @@
utiltmp = $(shell pwd)/debian/sysvinit-utils
rctmp = $(shell pwd)/debian/sysv-rc
inittmp = $(shell pwd)/debian/initscripts
+bootlogdtmp = $(shell pwd)/debian/bootlogd
doc = /usr/share/doc
LC_ALL = POSIX
@@ -123,6 +124,14 @@
$(INSTALL_DATA) debian/initscripts.conffiles \
$(inittmp)/DEBIAN/conffiles
sh debian/deps-mount >> debian/initscripts.substvars
+ #
+ # bootlogd package
+ #
+ $(MAKE) -C debian/src/bootlogd install DESTDIR=$(bootlogdtmp)
+ dh_installchangelogs -pbootlogd
+ sed -i -ne '/sysvinit (2.86.ds1-47)/q' -e p \
+ $(bootlogdtmp)$(doc)/bootlogd/changelog.Debian
+ dh_installdeb -pbootlogd
# Wrap it all up
dh_fixperms -X/etc/init.d/skeleton
diff -Naur -x .svn sysvinit.orig/debian/src/bootlogd/Makefile sysvinit/debian/src/bootlogd/Makefile
--- sysvinit.orig/debian/src/bootlogd/Makefile 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/src/bootlogd/Makefile 2011-10-09 02:23:22.559172854 -0700
@@ -0,0 +1,15 @@
+DESTDIR =
+sysconfdir = /etc
+
+INSTALL = install -m755 -o root -g root
+
+all:
+
+install:
+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)/.
+ cp -afv etc/* $(DESTDIR)$(sysconfdir)
+ find $(DESTDIR)$(sysconfdir) -type d -name .svn -print0 |xargs -r0 rm -r
+
+ chmod 755 $(DESTDIR)$(sysconfdir)/init.d/[a-z]*
+ chmod -R g-w $(DESTDIR)
+ chown -R root:root $(DESTDIR)
diff -Naur -x .svn sysvinit.orig/debian/src/bootlogd/etc/init.d/bootlogd sysvinit/debian/src/bootlogd/etc/init.d/bootlogd
--- sysvinit.orig/debian/src/bootlogd/etc/init.d/bootlogd 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/src/bootlogd/etc/init.d/bootlogd 2011-10-09 02:23:34.123030732 -0700
@@ -0,0 +1,87 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: bootlogd
+# Required-Start: mountdevsubfs
+# X-Start-Before: hostname keymap keyboard-setup procps pcmcia hwclock hwclockfirst hdparm hibernate-cleanup lvm2
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Start or stop bootlogd.
+# Description: Starts or stops the bootlogd log program
+# which logs boot messages.
+### END INIT INFO
+
+PATH=/sbin:/bin # No remote fs at start
+DAEMON=/sbin/bootlogd
+[ -x "$DAEMON" ] || exit 0
+NAME=bootlogd
+DESC="boot logger"
+BOOTLOGD_OPTS="-r -c"
+. /lib/init/vars.sh
+
+. /lib/lsb/init-functions
+
+# 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 continues
+# to implement the old behavior.
+SCRIPTNAME=${0##*/}
+SCRIPTNAME=${SCRIPTNAME#[SK]??}
+ACTION="$1"
+case "$0" in
+ *stop-bootlog*)
+ [ "$ACTION" = start ] && ACTION=stop
+ ;;
+esac
+
+case "$ACTION" in
+ start)
+ # PATH is set above
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ if [ -d /proc/1/. ]
+ then
+ umask 027
+ start-stop-daemon --start --quiet --exec $DAEMON -- \
+ $BOOTLOGD_OPTS
+ ES=$?
+ else
+ $DAEMON $BOOTLOGD_OPTS
+ ES=$?
+ fi
+ [ "$VERBOSE" != no ] && log_end_msg $ES
+ ;;
+ stop)
+ PATH=/bin:/sbin:/usr/bin:/usr/sbin
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ start-stop-daemon --oknodo --stop --quiet --exec $DAEMON
+ ES=$?
+ sleep 1
+ [ "$VERBOSE" != no ] && log_end_msg $ES
+ if [ -f /var/log/boot ] && [ -f /var/log/boot~ ]
+ then
+ [ "$VERBOSE" = no ] || log_action_begin_msg "Moving boot log file"
+ # bootlogd writes to boot, making backup at boot~
+ cd /var/log && {
+ chgrp adm boot || :
+ savelog -q -p -c 5 boot \
+ && mv boot.0 boot \
+ && mv boot~ boot.0
+ }
+ ES=$?
+ [ "$VERBOSE" = no ] || log_action_end_msg $ES
+ fi
+ ;;
+ restart|force-reload)
+ /etc/init.d/bootlogd stop
+ /etc/init.d/bootlogd start
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+ exit 3
+ ;;
+esac
+
+:
diff -Naur -x .svn sysvinit.orig/debian/src/bootlogd/etc/init.d/stop-bootlogd sysvinit/debian/src/bootlogd/etc/init.d/stop-bootlogd
--- sysvinit.orig/debian/src/bootlogd/etc/init.d/stop-bootlogd 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/src/bootlogd/etc/init.d/stop-bootlogd 2011-10-09 02:23:39.326967167 -0700
@@ -0,0 +1,33 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: stop-bootlogd
+# Required-Start: $local_fs $all
+# Required-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop:
+# Short-Description: Stop bootlogd
+# Description: See the init.d/bootlogd script
+### END INIT INFO
+
+NAME=stop-bootlogd
+DAEMON=/sbin/bootlogd
+
+[ -x "$DAEMON" ] || exit 0
+
+case "$1" in
+ start)
+ /etc/init.d/bootlogd stop
+ ;;
+ stop|restart|force-reload)
+ # No-op
+ ;;
+ status)
+ exec /etc/init.d/bootlogd status
+ ;;
+ *)
+ echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
diff -Naur -x .svn sysvinit.orig/debian/src/bootlogd/etc/init.d/stop-bootlogd-single sysvinit/debian/src/bootlogd/etc/init.d/stop-bootlogd-single
--- sysvinit.orig/debian/src/bootlogd/etc/init.d/stop-bootlogd-single 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/src/bootlogd/etc/init.d/stop-bootlogd-single 2011-10-09 02:23:43.714913428 -0700
@@ -0,0 +1,51 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: stop-bootlogd-single
+# Required-Start: $local_fs $all
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Stop bootlogd in single user mode
+# Description: See the init.d/bootlogd script
+### END INIT INFO
+#
+# This has to run in the boot sequence (rcS.d), and not in the "single
+# user" sequence (rc1.d), because rc1.d/ is not used when booting into
+# single user. "grep :[S1]: /etc/inittab" show that single user is just
+# a call to /sbin/sulogin, while runlevel 1 is a call to
+# "/etc/init.d/rc 1" which in the end switches to runlevel S to run
+# /sbin/sulogin.
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+NAME=stop-bootlogd-single
+DAEMON=/sbin/bootlogd
+
+[ -x "$DAEMON" ] || exit 0
+
+case "$1" in
+ start)
+ 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
+ ;;
+ status)
+ exec /etc/init.d/bootlogd status
+ ;;
+ *)
+ echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
diff -Naur -x .svn sysvinit.orig/debian/src/initscripts/etc/default/bootlogd sysvinit/debian/src/initscripts/etc/default/bootlogd
--- sysvinit.orig/debian/src/initscripts/etc/default/bootlogd 2011-10-09 02:38:10.104282879 -0700
+++ sysvinit/debian/src/initscripts/etc/default/bootlogd 1969-12-31 16:00:00.000000000 -0800
@@ -1,2 +0,0 @@
-# Run bootlogd at startup ?
-BOOTLOGD_ENABLE=No
diff -Naur -x .svn sysvinit.orig/debian/src/initscripts/etc/init.d/bootlogd sysvinit/debian/src/initscripts/etc/init.d/bootlogd
--- sysvinit.orig/debian/src/initscripts/etc/init.d/bootlogd 2011-10-09 02:38:10.108282829 -0700
+++ sysvinit/debian/src/initscripts/etc/init.d/bootlogd 1969-12-31 16:00:00.000000000 -0800
@@ -1,96 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: bootlogd
-# Required-Start: mountdevsubfs
-# X-Start-Before: hostname keymap keyboard-setup procps pcmcia hwclock hwclockfirst hdparm hibernate-cleanup lvm2
-# Required-Stop:
-# Default-Start: S
-# Default-Stop:
-# Short-Description: Start or stop bootlogd.
-# Description: Starts or stops the bootlogd log program
-# which logs boot messages.
-### END INIT INFO
-
-PATH=/sbin:/bin # No remote fs at start
-DAEMON=/sbin/bootlogd
-[ -x "$DAEMON" ] || exit 0
-NAME=bootlogd
-DESC="boot logger"
-BOOTLOGD_OPTS="-r -c"
-[ -r /etc/default/bootlogd ] && . /etc/default/bootlogd
-. /lib/init/vars.sh
-
-. /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 distinct script, but for backward compatibility this script continues
-# to implement the old behavior.
-SCRIPTNAME=${0##*/}
-SCRIPTNAME=${SCRIPTNAME#[SK]??}
-ACTION="$1"
-case "$0" in
- *stop-bootlog*)
- [ "$ACTION" = start ] && ACTION=stop
- ;;
-esac
-
-case "$ACTION" in
- start)
- # PATH is set above
- [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
- if [ -d /proc/1/. ]
- then
- umask 027
- start-stop-daemon --start --quiet --exec $DAEMON -- \
- $BOOTLOGD_OPTS
- ES=$?
- else
- $DAEMON $BOOTLOGD_OPTS
- ES=$?
- fi
- [ "$VERBOSE" != no ] && log_end_msg $ES
- ;;
- stop)
- PATH=/bin:/sbin:/usr/bin:/usr/sbin
- [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --oknodo --stop --quiet --exec $DAEMON
- ES=$?
- sleep 1
- [ "$VERBOSE" != no ] && log_end_msg $ES
- if [ -f /var/log/boot ] && [ -f /var/log/boot~ ]
- then
- [ "$VERBOSE" = no ] || log_action_begin_msg "Moving boot log file"
- # bootlogd writes to boot, making backup at boot~
- cd /var/log && {
- chgrp adm boot || :
- savelog -q -p -c 5 boot \
- && mv boot.0 boot \
- && mv boot~ boot.0
- }
- ES=$?
- [ "$VERBOSE" = no ] || log_action_end_msg $ES
- fi
- ;;
- restart|force-reload)
- /etc/init.d/bootlogd stop
- /etc/init.d/bootlogd start
- ;;
- status)
- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
- ;;
- *)
- echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
- exit 3
- ;;
-esac
-
-:
diff -Naur -x .svn sysvinit.orig/debian/src/initscripts/etc/init.d/stop-bootlogd sysvinit/debian/src/initscripts/etc/init.d/stop-bootlogd
--- sysvinit.orig/debian/src/initscripts/etc/init.d/stop-bootlogd 2011-10-09 02:38:10.108282829 -0700
+++ sysvinit/debian/src/initscripts/etc/init.d/stop-bootlogd 1969-12-31 16:00:00.000000000 -0800
@@ -1,33 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: stop-bootlogd
-# Required-Start: $local_fs $all
-# Required-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop:
-# Short-Description: Stop bootlogd
-# Description: See the init.d/bootlogd script
-### END INIT INFO
-
-NAME=stop-bootlogd
-DAEMON=/sbin/bootlogd
-
-[ -x "$DAEMON" ] || exit 0
-
-case "$1" in
- start)
- /etc/init.d/bootlogd stop
- ;;
- stop|restart|force-reload)
- # No-op
- ;;
- status)
- exec /etc/init.d/bootlogd status
- ;;
- *)
- echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff -Naur -x .svn sysvinit.orig/debian/src/initscripts/etc/init.d/stop-bootlogd-single sysvinit/debian/src/initscripts/etc/init.d/stop-bootlogd-single
--- sysvinit.orig/debian/src/initscripts/etc/init.d/stop-bootlogd-single 2011-10-09 02:38:10.108282829 -0700
+++ sysvinit/debian/src/initscripts/etc/init.d/stop-bootlogd-single 1969-12-31 16:00:00.000000000 -0800
@@ -1,51 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: stop-bootlogd-single
-# Required-Start: $local_fs $all
-# Required-Stop:
-# Default-Start: S
-# Default-Stop:
-# Short-Description: Stop bootlogd in single user mode
-# Description: See the init.d/bootlogd script
-### END INIT INFO
-#
-# This has to run in the boot sequence (rcS.d), and not in the "single
-# user" sequence (rc1.d), because rc1.d/ is not used when booting into
-# single user. "grep :[S1]: /etc/inittab" show that single user is just
-# a call to /sbin/sulogin, while runlevel 1 is a call to
-# "/etc/init.d/rc 1" which in the end switches to runlevel S to run
-# /sbin/sulogin.
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=stop-bootlogd-single
-DAEMON=/sbin/bootlogd
-
-[ -x "$DAEMON" ] || exit 0
-
-case "$1" in
- start)
- 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
- ;;
- status)
- exec /etc/init.d/bootlogd status
- ;;
- *)
- echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
- exit 3
- ;;
-esac
-
-:
diff -Naur -x .svn sysvinit.orig/debian/sysvinit-utils.NEWS sysvinit/debian/sysvinit-utils.NEWS
--- sysvinit.orig/debian/sysvinit-utils.NEWS 1969-12-31 16:00:00.000000000 -0800
+++ sysvinit/debian/sysvinit-utils.NEWS 2011-10-09 01:52:39.069191287 -0700
@@ -0,0 +1,9 @@
+sysvinit-utils (2.88dsf-14) unstable; urgency=low
+
+ bootlogd has moved from sysvinit-utils to a separate bootlogd package. If
+ you wish to continue using bootlogd, please install the bootlogd package.
+ Note that the configuration file /etc/default/bootlogd and its option
+ BOOTLOGD_ENABLE no longer exist; if you do not wish to run bootlogd, remove
+ the bootlogd package.
+
+ -- Josh Triplett <j...@joshtriplett.org> Sun, 09 Oct 2011 01:50:15 -0700
diff -Naur -x .svn sysvinit.orig/debian/sysvinit-utils.install sysvinit/debian/sysvinit-utils.install
--- sysvinit.orig/debian/sysvinit-utils.install 2011-10-09 02:38:10.112282780 -0700
+++ sysvinit/debian/sysvinit-utils.install 2011-10-09 01:19:56.587655349 -0700
@@ -1,4 +1,3 @@
-sbin/bootlogd
sbin/fstab-decode
sbin/killall5
sbin/sulogin
@@ -7,7 +6,6 @@
usr/share/man/man1/last.1
usr/share/man/man1/lastb.1
usr/share/man/man1/mesg.1
-usr/share/man/man8/bootlogd.8
usr/share/man/man8/fstab-decode.8
usr/share/man/man8/killall5.8
usr/share/man/man8/pidof.8
