hwclockfirst.sh: initscript LSB header in conflict with update-rc.d options

hwclockfirst should start before checkroot, followed by hwclock as far as I
understand. This is not represented in the current dependency information,
hwlockfirst and hwclock both only require mountdevsubfs to have started, thus
they are started at same sequence in dependency based boot.

Addresses-Debian-Bug: 487196
Signed-off-by: LaMont Jones <lamont@debian.org>

diff --git a/debian/hwclock.sh b/debian/hwclock.sh
index 80b17bc44ba6a74edc2c7691aa43478b390af9b1..40eea8c0bc05f6768affc57bf3511b385c86b361 100644 (file)
--- a/debian/hwclock.sh
+++ b/debian/hwclock.sh
@@ -18,7 +18,7 @@
 
 ### BEGIN INIT INFO
 # Provides:          hwclock
-# Required-Start:    mountdevsubfs
+# Required-Start:    $local_fs
 # Required-Stop:     $local_fs
 # Default-Start:     S
 # Default-Stop:      0 6

diff --git a/debian/rules b/debian/rules
index 6e099eaf29133f8b57e4b7f58ddeb07ec99cf6d4..e91e7840b3854d79b2be1a99087f74e47e044cb6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -107,6 +107,7 @@ endif
            install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclock.sh; \
            install -m 755 debian/hwclock.sh debian/util-linux/etc/init.d/hwclockfirst.sh; \
            sed -i -e '/^FIRST=/s/no/yes/' -e '/Provides:/s/ck/ckfirst/' \
+               -e '/Required-Start:/s/.local_fs/mountdevsubfs/' \
                -e '/Required-Stop:/s/.local_fs/umountroot/' \
                -e '/Default-Start:/a# Default-Stop:' -e '/Default-Stop:/d' \
                debian/util-linux/etc/init.d/hwclockfirst.sh; \