rpms/ntp/devel ntp.spec,1.79,1.80 ntpdate.init,1.1,1.2

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/ntp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29125

Modified Files:
	ntp.spec ntpdate.init 
Log Message:
- don't use /etc/sysconfig/clock in ntpdate init script



Index: ntp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntp.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ntp.spec	10 Mar 2008 19:48:46 -0000	1.79
+++ ntp.spec	7 Apr 2008 17:18:26 -0000	1.80
@@ -1,7 +1,7 @@
 Summary: Synchronizes system time using the Network Time Protocol (NTP)
 Name: ntp
 Version: 4.2.4p4
-Release: 5%{?dist}
+Release: 6%{?dist}
 # primary license (COPYRIGHT) : MIT
 # ElectricFence/ (not used) : GPLv2
 # kernel/sys/ppsclock.h (not used) : BSD with advertising
@@ -243,6 +243,9 @@
 
 
 %changelog
+* Mon Apr 07 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p4-6
+- don't use /etc/sysconfig/clock in ntpdate init script
+
 * Mon Mar 10 2008 Miroslav Lichvar <mlichvar at redhat.com> 4.2.4p4-5
 - fix building IPv6 support with new glibc-headers (#436713)
 - avoid unaligned memory access (#435301)


Index: ntpdate.init
===================================================================
RCS file: /cvs/pkgs/rpms/ntp/devel/ntpdate.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ntpdate.init	29 Feb 2008 14:54:31 -0000	1.1
+++ ntpdate.init	7 Apr 2008 17:18:26 -0000	1.2
@@ -22,38 +22,6 @@
 ntpconf=/etc/ntp.conf
 ntpstep=/etc/ntp/step-tickers
 
-sync_hwclock() {
-	ARC=0
-	SRM=0
-	UTC=0
-
-	if [ -f /etc/sysconfig/clock ]; then
-	    . /etc/sysconfig/clock
-
-	    # convert old style clock config to new values
-	    if [ "${CLOCKMODE}" = "GMT" ]; then
-		UTC=true
-	    elif [ "${CLOCKMODE}" = "ARC" ]; then
-		ARC=true
-	    fi
-	fi
-
-	CLOCKFLAGS="$CLOCKFLAGS --systohc"
-
-	case "$UTC" in
-	    yes|true)	CLOCKFLAGS="$CLOCKFLAGS --utc";;
-	    no|false)	CLOCKFLAGS="$CLOCKFLAGS --localtime";;
-	esac
-	case "$ARC" in
-	    yes|true)	CLOCKFLAGS="$CLOCKFLAGS --arc";;
-	esac
-	case "$SRM" in
-	    yes|true)	CLOCKFLAGS="$CLOCKFLAGS --srm";;
-	esac
-
-	action $"Syncing hardware clock to system time" /sbin/hwclock $CLOCKFLAGS
-}
-
 start() {
 	[ "$NETWORKING" = "no" ] && exit 1
 
@@ -79,14 +47,14 @@
 	echo -n $"$prog: Synchronizing with time server: "
 	/usr/sbin/ntpdate $OPTIONS $tickers &> /dev/null
 	RETVAL=$?
+	[ $RETVAL -eq 0 ] && success || failure
+	echo
 	if [ $RETVAL -eq 0 ]; then
-	    success
 	    touch $lockfile
-	    [ "$SYNC_HWCLOCK" = "yes" ] && sync_hwclock
-	else
-	    failure
+	    [ "$SYNC_HWCLOCK" = "yes" ] && \
+		action $"Syncing hardware clock to system time" \
+		    /sbin/hwclock --systohc
 	fi
-	echo
 	return $RETVAL
 }