[Pkg-sysvinit-commits] r335 - sysvinit/trunk/debian

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-29 14:02:20 +0000 (Tue, 29 Nov 2005)
New Revision: 335

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/postinst
Log:
Tweak changelog

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-29 14:02:08 UTC (rev 334)
+++ sysvinit/trunk/debian/changelog	2005-11-29 14:02:20 UTC (rev 335)
@@ -23,15 +23,16 @@
   * checkroot.sh, mountvirtfs: Eliminate use of dir_writable in order to
     try to please selinux  (Closes: #333836)
   * checkroot.sh: Only run findfs for mount on /  (Closes: #275680)
-    Thanks to Cameron Hutchison for the patch
+    Thanks to Cameron Hutchison for the patch.
   * mountall.sh, mountnfs.sh: Split call to bootclean out into separate
     script called at the next sequence number  (Closes: #286479)
   * bootmisc.sh: Shorten motd header  (Closes: #340017)
   * bootmisc.sh: Rotate dmesg log with savelog (Closes: #237074)
+    and chgrp adm.
   * Replace /etc/rc1.d/20single by /etc/rc1.d/S30killprocs and
     /etc/rc1.d/S99single so that packages can insert scripts to do
     things between the "killall5" in the former and the "exec init -t1 S"
-    in the latter.  This addresses #145280.
+    in the latter.  This may help to address #145280.
   * umountfs: Unmount tmpfs before swapoff and other fs's afterwards
     (Closes: #328582, hopefully without reopening #84782)
   * Make stop-bootlogd a distinct script rather than a symlink to bootlogd.
@@ -47,7 +48,9 @@
     argument may change in the future if we decide to implement this more
     generally.
   * Improve skeleton initscript
-  * all scripts: Clean up indentation and formatting
+  * all scripts: Clean up and standardize indentation and formatting
+  * all scripts: Use the which program to test for executables rather
+    than fixed paths
   * initscripts preinst: Remove ancient /etc/init.d/boot conversion code
   * default config files: Clean up comments
   * Make initscripts Depend on debianutils >= 2.13.1 in order to prevent

Modified: sysvinit/trunk/debian/postinst
===================================================================
--- sysvinit/trunk/debian/postinst	2005-11-29 14:02:08 UTC (rev 334)
+++ sysvinit/trunk/debian/postinst	2005-11-29 14:02:20 UTC (rev 335)
@@ -1,35 +1,34 @@
 #! /bin/sh
 #
-# debian.postinst
+# sysvinit postinst
 #
-# Version:	debian.postinst  2.85-14  31-Mar-2004  miquels at cistron.nl
-#
 
 set -e
 
 case "$1" in
-	configure)
-		oldver=$2
-		;;
-	abort-upgrade|abort-remove|abort-deconfigure)
-		exit 0
-		;;
+  configure)
+	oldver=$2
+	;;
+  abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+	;;
 esac
+
 umask 022
 
 case `uname -s` in
-	*FreeBSD)
-		INITCTL=/etc/.initctl
-		;;
-	*)
-		INITCTL=/dev/initctl
-		;;
+  *FreeBSD)
+	INITCTL=/etc/.initctl
+	;;
+  *)
+	INITCTL=/dev/initctl
+	;;
 esac
 
 #
-#	Check /dev/initctl
+# Check /dev/initctl
 #
-if [ ! -p $INITCTL ]
+if [ "$INITCTL" ] && [ ! -p "$INITCTL" ]
 then
 	echo "sysvinit: creating $INITCTL"
 	rm -f $INITCTL
@@ -39,11 +38,11 @@
 
 if [ ! -f /etc/inittab ]
 then
-	cp -a /usr/share/sysvinit/inittab /etc/inittab
+	cp -p /usr/share/sysvinit/inittab /etc/inittab
 fi
 
 #
-#	Tell init to re-exec itself.
+# Tell init to re-exec itself.
 #
 init u ||: