- missing BR: pciutils-devel

[packages/ntp.git] / ntp-client.init

diff --git a/ntp-client.init b/ntp-client.init
index c773d41a99ea8401531f6138084483315d8ca6de..ff624c597a8adfe3deb15d45beef1705534beb72 100644 (file)
--- a/ntp-client.init
+++ b/ntp-client.init
@@ -8,15 +8,14 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+upstart_controlled --except cronsettime
+
 # Source networking configuration.
 . /etc/sysconfig/network
 
 # if not specified in config
 NTPDATE_USER="ntp"
 
-# Source clock configuration
-[ -r /etc/sysconfig/clock ] &&  . /etc/sysconfig/clock
-
 # Source ntp configuration
 . /etc/sysconfig/ntpdate
 
@@ -34,22 +33,7 @@ ntpdate_background() {
        /usr/sbin/ntpdate -s ${NTPDATE_USER:+-U $NTPDATE_USER} $NTPDATE_OPTIONS $NTPDATE_SERVERS || return $?
 
        if is_yes "$SYNC_HWCLOCK"; then
-               CLOCKFLAGS="--systohc"
-               if is_yes "$UTC" ; then
-                       CLOCKFLAGS="$CLOCKFLAGS --utc"
-               else
-                       CLOCKFLAGS="$CLOCKFLAGS --localtime"
-               fi
-
-               if is_yes "$ARC" ; then
-                       CLOCKFLAGS="$CLOCKFLAGS -A"
-               fi
-
-               if is_yes "$SRM" ; then
-                       CLOCKFLAGS="$CLOCKFLAGS -S"
-               fi
-
-               /sbin/hwclock $CLOCKFLAGS
+               /sbin/hwclock --systohc
        fi
 }