- rel 3; revert, current hwclock versions are smart enough to know what to do based...

Changed files:
    ntp-client.init -> 1.13
    ntp.spec -> 1.144

diff --git a/ntp-client.init b/ntp-client.init
index c773d41a99ea8401531f6138084483315d8ca6de..df2fb97a62a8a15346d687e7df83af8ebfcfb784 100644 (file)
--- a/ntp-client.init
+++ b/ntp-client.init
@@ -14,9 +14,6 @@
 # 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 +31,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
 }
 

diff --git a/ntp.spec b/ntp.spec
index cf39abe56be9efb86bf375b3be1a2305aa555a30..7fa590c345a58d388546fc36aa827f3534e14960 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -11,7 +11,7 @@ Summary(pl.UTF-8):    Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):  Network Time Protocol versão 4
 Name:          ntp
 Version:       4.2.6p1
-Release:       2
+Release:       3
 License:       distributable
 Group:         Networking/Daemons
 Source0:       http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz