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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-03 12:48:19 +0000 (Fri, 03 Jul 2009)
New Revision: 1369

Added:
   sysvinit/trunk/debian/initscripts/etc/init.d/bootlogs
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/conffiles
   sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
   sysvinit/trunk/debian/initscripts/postinst
Log:
Split init.d/bootmisc.sh in two, one part that need to run very early,
and another (bootlogs) which can be executed later, to make it possible
to postpone some work until after gdm/kdm/xdm is started.  Based on
patch from Scott James Remnant and Ubuntu.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-01 18:07:57 UTC (rev 1368)
+++ sysvinit/trunk/debian/changelog	2009-07-03 12:48:19 UTC (rev 1369)
@@ -5,6 +5,10 @@
     Patch from Michael Tokarev.
   * Do not rotate /var/log/dmesg if the file is not present (Closes:
     #533047).  Patch from Aaro Koskinen.
+  * Split init.d/bootmisc.sh in two, one part that need to run very early,
+    and another (bootlogs) which can be executed later, to make it possible
+    to postpone some work until after gdm/kdm/xdm is started.  Based on
+    patch from Scott James Remnant and Ubuntu.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 Jul 2009 20:04:20 +0200
 

Modified: sysvinit/trunk/debian/initscripts/conffiles
===================================================================
--- sysvinit/trunk/debian/initscripts/conffiles	2009-07-01 18:07:57 UTC (rev 1368)
+++ sysvinit/trunk/debian/initscripts/conffiles	2009-07-03 12:48:19 UTC (rev 1369)
@@ -1,6 +1,7 @@
 /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
 /etc/init.d/checkroot.sh

Added: sysvinit/trunk/debian/initscripts/etc/init.d/bootlogs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootlogs	                        (rev 0)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootlogs	2009-07-03 12:48:19 UTC (rev 1369)
@@ -0,0 +1,64 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          bootlogs
+# Required-Start:    $local_fs
+# Required-Stop:
+# Should-Start:      udev gdm kdm xdm
+# Default-Start:     1 2 3 4 5
+# Default-Stop:
+# Short-Description: Log file handling to be done during bootup.
+# Description:       Various things that don't need to be done particularly early
+#                    in the boot, just before getty is run.
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
+. /lib/init/vars.sh
+
+do_start () {
+	# Update motd
+	uname -snrvm > /var/run/motd
+	[ -f /etc/motd.tail ] && cat /etc/motd.tail >> /var/run/motd
+
+	# Save kernel messages in /var/log/dmesg
+	if which dmesg >/dev/null 2>&1
+	then
+		savelog -q -p -c 5 /var/log/dmesg
+		dmesg -s 524288 > /var/log/dmesg
+		chgrp adm /var/log/dmesg || :
+	elif [ -c /dev/klog ]
+	then
+		savelog -q -p -c 5 /var/log/dmesg
+		dd if=/dev/klog of=/var/log/dmesg &
+		sleep 1
+		kill $!
+		[ -f /var/log/dmesg ] && { chgrp adm /var/log/dmesg || : ; }
+	fi
+
+	#
+	#	Save udev log in /var/log/udev
+	#
+	if [ -e /dev/.udev.log ]
+	then
+		mv -f /dev/.udev.log /var/log/udev
+	fi
+}
+
+case "$1" in
+  start|"")
+	do_start
+	;;
+  restart|reload|force-reload)
+	echo "Error: argument '$1' not supported" >&2
+	exit 3
+	;;
+  stop)
+	# No-op
+	;;
+  *)
+	echo "Usage: bootmisc.sh [start|stop]" >&2
+	exit 3
+	;;
+esac
+
+:

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2009-07-01 18:07:57 UTC (rev 1368)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2009-07-03 12:48:19 UTC (rev 1369)
@@ -40,33 +40,6 @@
 		chown -f root:tty /dev/tty[p-za-e][0-9a-f]
 	fi
 
-	# Update motd
-	uname -snrvm > /var/run/motd
-	[ -f /etc/motd.tail ] && cat /etc/motd.tail >> /var/run/motd
-
-	# Save kernel messages in /var/log/dmesg
-	if which dmesg >/dev/null 2>&1
-	then
-		[ -f /var/log/dmesg ] && savelog -q -p -c 5 /var/log/dmesg
-		dmesg -s 524288 > /var/log/dmesg
-		chgrp adm /var/log/dmesg || :
-	elif [ -c /dev/klog ]
-	then
-		[ -f /var/log/dmesg ] && savelog -q -p -c 5 /var/log/dmesg
-		dd if=/dev/klog of=/var/log/dmesg &
-		sleep 1
-		kill $!
-		[ -f /var/log/dmesg ] && { chgrp adm /var/log/dmesg || : ; }
-	fi
-
-	#
-	#	Save udev log in /var/log/udev
-	#
-	if [ -e /dev/.udev.log ]
-	then
-		mv -f /dev/.udev.log /var/log/udev
-	fi
-
 	# Remove bootclean's flag files.
 	# Don't run bootclean again after this!
 	rm -f /tmp/.clean /var/run/.clean /var/lock/.clean

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2009-07-01 18:07:57 UTC (rev 1368)
+++ sysvinit/trunk/debian/initscripts/postinst	2009-07-03 12:48:19 UTC (rev 1369)
@@ -140,6 +140,7 @@
 
 updatercd killprocs              start 30 1 .
 updatercd single                 start 90 1 .
+updatercd bootlogs               start 70 1 2 3 4 5 .
 updatercd rc.local               start 99 2 3 4 5 .
 updatercd rmnologin              start 99 2 3 4 5 .
 updatercd stop-bootlogd-single   start 99 S .