2.12r-4ubuntu4

diff --git a/debian/changelog b/debian/changelog
index b7cc7403591ebf4ee8349f807b7ed543c38255af..30c35cced24b62c303bd7f20b0c3742d97cb8cbc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+util-linux (2.12r-4ubuntu4) dapper; urgency=low
+
+  * Rip out the log message code from the init script, as it's run in the
+    background so upsets things anyway.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 29 Aug 2005 10:53:26 +0100
+
 util-linux (2.12r-4ubuntu3) dapper; urgency=low
 
   * Set the hardware clock via a udev rule as soon as /dev/rtc is available.

diff --git a/debian/hwclock.sh b/debian/hwclock.sh
index 6da58b208e1990f857d08eabc837083621c8e7f0..52d1f2d3d213f05fce205e111968a80c6890caa4 100644 (file)
--- a/debian/hwclock.sh
+++ b/debian/hwclock.sh
@@ -26,7 +26,6 @@ hwclocksh()
     . /etc/default/rcS
 
     . /lib/lsb/init-functions
-    verbose_log_action_msg() { [ "$VERBOSE" = no ] || log_action_msg "$@"; }
 
     [ "$GMT" = "-u" ] && UTC="yes"
     case "$UTC" in
@@ -36,13 +35,13 @@ hwclocksh()
        yes)    GMT="--utc"
                UTC="--utc"
                ;;
-       *)      log_action_msg "Unknown UTC setting: \"$UTC\""; return 1 ;;
+       *)      return 1 ;;
     esac
 
     case "$BADYEAR" in
        no|"")  BADYEAR="" ;;
        yes)    BADYEAR="--badyear" ;;
-       *)      log_action_msg "unknown BADYEAR setting: \"$BADYEAR\""; return 1 ;;
+       *)      return 1 ;;
     esac
 
     case "$1" in
@@ -75,8 +74,6 @@ hwclocksh()
            :
 
            if [ "$HWCLOCKACCESS" != no ]; then
-               [ "$VERBOSE" = no ] || log_daemon_msg "Setting the system clock"
-
                # Copies Hardware Clock time to System Clock using the correct
                # timezone for hardware clocks in local time, and sets kernel
                # timezone. DO NOT REMOVE.
@@ -87,13 +84,7 @@ hwclocksh()
                        echo "Invalid system date -- setting to 1/1/2002"
                        /sbin/hwclock --set --date '1/1/2002 00:00:00' $GMT $HWCLOCKPARS $BADYEAR
                fi
-
-               #       Announce the local time.
-               verbose_log_action_msg "System Clock set. Local time: `date $UTC`"
-           else
-               verbose_log_action_msg "Not setting System Clock"
            fi
-           [ $VERBOSE = no ] || log_end_msg 0
            ;;
        stop|restart|reload|force-reload)
            #
@@ -104,16 +95,11 @@ hwclocksh()
            #          clock will not be carried across reboots.
            #
            if [ "$HWCLOCKACCESS" != no ]; then
-               log_daemon_msg "Saving the system clock"
                if [ "$GMT" = "-u" ]; then
                    GMT="--utc"
                fi
                /sbin/hwclock --systohc $GMT $HWCLOCKPARS $BADYEAR
-               verbose_log_action_msg "Hardware Clock updated to `date`"
-           else
-               verbose_log_action_msg "Not saving System Clock"
            fi
-           log_end_msg 0
            ;;
        show)
            if [ "$HWCLOCKACCESS" != no ]; then