hwclock*.sh: one more round of header tweaks.

Addresses-Debian-Bug: 520607
Signed-off-by: Petter Reinholdtsen <pere@hungry.com>
Signed-off-by: LaMont Jones <lamont@debian.org>

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

diff --git a/debian/rules b/debian/rules
index e91e7840b3854d79b2be1a99087f74e47e044cb6..5f934769dbba422fec842918ba8cff4cbc38f0b6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -107,8 +107,9 @@ 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 '/Required-Start:/s/checkroot/mountdevsubfs/' \
+               -e '/Required-Start:/a# Required-Stop:' -e '/Required-Stop:/d' \
+               -e '/Default-Start:/a# X-Start-Before:    checkroot' \
                -e '/Default-Start:/a# Default-Stop:' -e '/Default-Stop:/d' \
                debian/util-linux/etc/init.d/hwclockfirst.sh; \
        fi