Author: arekm Date: Thu Jan 27 05:59:13 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; revert, current hwclock versions are smart enough to know what to do
based on adjtime file.
---- Files affected:
packages/ntp:
ntp-client.init (1.12 -> 1.13) , ntp.spec (1.143 -> 1.144)
---- Diffs:
================================================================
Index: packages/ntp/ntp-client.init
diff -u packages/ntp/ntp-client.init:1.12 packages/ntp/ntp-client.init:1.13
--- packages/ntp/ntp-client.init:1.12 Thu Jan 27 06:54:23 2011
+++ packages/ntp/ntp-client.init Thu Jan 27 06:59:08 2011
@@ -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 @@
/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
}
================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.143 packages/ntp/ntp.spec:1.144
--- packages/ntp/ntp.spec:1.143 Thu Jan 27 06:54:23 2011
+++ packages/ntp/ntp.spec Thu Jan 27 06:59:08 2011
@@ -12,7 +12,7 @@
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
@@ -429,6 +429,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.144 2011/01/27 05:59:08 arekm
+- rel 3; revert, current hwclock versions are smart enough to know what to do
based on adjtime file.
+
Revision 1.143 2011/01/27 05:54:23 arekm
rel 2; when syncing hardware clock obey sysconfig/clock settings
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-client.init?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.143&r2=1.144&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
