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

[pere at alioth.debian.org]

Author: pere
Date: 2008-01-07 23:25:37 +0000 (Mon, 07 Jan 2008)
New Revision: 1203

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
Log:
Revert change to drop dependencies while we wait for the reverse dependencies to show up in cryptsetup and kexec-tools.  Clean up changelog.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-01-07 22:12:42 UTC (rev 1202)
+++ sysvinit/trunk/debian/changelog	2008-01-07 23:25:37 UTC (rev 1203)
@@ -23,19 +23,12 @@
   * Extend waiting time of init.d/sendsigs from 0-5 seconds to 0-10
     seconds, to give slow processes more time to shut down properly.
   * Extend init.d/sendsigs to sync before killing processes, and to
-    detect and report if it had to use SIGKILL to terminate processes.
-    Report the use of SIGKILL as a failure.  Based on ideas from Gabor
-    Gombas.
+    detect and report as a failure if it had to use SIGKILL to
+    terminate processes.  Based on ideas from Gabor Gombas.
   * Drop lvm as optional depend for checkfs, mountall and umountfs,
     and conflict with insserv versions before 1.09.0-12 to make sure a
     version with the override file providing the same dependencies as
     reverse dependencies is used.
-  * Drop cryptdisks as optional depend for checkfs, as it is better
-    for cryptsetup to list this as a reverse depend to let the
-    cryptsetup package control its boot sequence location completely.
-  * Drop kexec as optional depend for umountroot, as it is better for
-    kexec to list this as a reverse depend to let the kexec-tools
-    package control its boot sequence location completely.
   * Extend sendsigs code to omit some pids during shutdown to also
     load pids from /lib/init/rw/sendsigs.omit and
     /lib/init/rw/sendsigs.omit.d/packagename, to make it easier for
@@ -44,13 +37,13 @@
     #459146).  Based on patch from Kel Modderman.
   * Change init.d/bootlogd to not report failure when trying to stop
     an already stopped bootlogd.
-  * Change initd/killprocs to use same optimization as sendsigs, to
-    avoid having to wait 5 seconds if there is no more processes.
+  * Change initd/killprocs to use the same optimization as sendsigs,
+    to avoid having to wait 5 seconds if there is no more processes.
   * Document the way to list /sys/ in /etc/fstab in initscripts
     README.Debian (Closes: #401424).
   * Reduce stop dependency for mountoverflowtmp from $local_fs to
-    umountfs, to stop it later during shutdown, and to make it
-    possible to make it part of the $local_fs dependencies.
+    umountfs, to allow it to stop later during shutdown, and to make
+    it possible to make it part of the $local_fs dependencies.
   * Remove initscripts conflict on mdutils.  mdutils was removed in
     woody.
   * Move optional start dependency on udev-mtab from checkfs to

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2008-01-07 22:12:42 UTC (rev 1202)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2008-01-07 23:25:37 UTC (rev 1203)
@@ -3,7 +3,7 @@
 # Provides:          checkfs
 # Required-Start:    checkroot
 # Required-Stop:
-# Should-Start:      mtab
+# Should-Start:      mtab cryptdisks
 # Default-Start:     S
 # Default-Stop:
 # Short-Description: Check all filesystems.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2008-01-07 22:12:42 UTC (rev 1202)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2008-01-07 23:25:37 UTC (rev 1203)
@@ -3,7 +3,7 @@
 # Provides:          umountroot
 # Required-Start:
 # Required-Stop:
-# Should-Stop:       halt reboot
+# Should-Stop:       halt reboot kexec
 # Default-Start:
 # Default-Stop:      0 6
 # Short-Description: Mount the root filesystem read-only.