v2.12r-6

diff --git a/debian/changelog b/debian/changelog
index 787c50530488db272ed53f59e3f7ff2adec47b77..259345aadacbc5e9c93ecf5c5d6266d3b0ac9bac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+util-linux (2.12r-6) unstable; urgency=low
+
+  * make hwclock even more policy compilant.
+
+ -- LaMont Jones <lamont@debian.org>  Sat, 28 Jan 2006 08:57:45 -0700
+
 util-linux (2.12r-5) unstable; urgency=low
 
   * make hwclock prettier.  Closes: #348718

diff --git a/debian/hwclock.sh b/debian/hwclock.sh
index a10f04de78d559174027c0eaafe50f083643d1be..9f3d47f590538845f3e81a54f065900312b8682f 100644 (file)
--- a/debian/hwclock.sh
+++ b/debian/hwclock.sh
@@ -87,7 +87,7 @@ hwclocksh()
            fi
 
            if [ "$HWCLOCKACCESS" != no ]; then
-               log_daemon_msg "Setting the system clock$AGAIN"
+               log_action_msg "Setting the system clock$AGAIN."
 
                # Copies Hardware Clock time to System Clock using the correct
                # timezone for hardware clocks in local time, and sets kernel
@@ -112,10 +112,8 @@ hwclocksh()
                fi
 
                #       Announce the local time.
-               log_end_msg 0
                verbose_log_action_msg "System Clock set. Local time: `date $UTC`"
            else
-               log_end_msg 0
                verbose_log_action_msg "Not setting System Clock"
            fi
            ;;
@@ -131,15 +129,13 @@ hwclocksh()
            #          clock will not be carried across reboots.
            #
            if [ "$HWCLOCKACCESS" != no ]; then
-               log_daemon_msg "Saving the system clock"
+               log_action_msg "Saving the system clock."
                if [ "$GMT" = "-u" ]; then
                    GMT="--utc"
                fi
                /sbin/hwclock --systohc $GMT $HWCLOCKPARS $BADYEAR
-               log_end_msg 0
                verbose_log_action_msg "Hardware Clock updated to `date`"
            else
-               log_end_msg 0
                verbose_log_action_msg "Not saving System Clock"
            fi
            ;;