packages: ntp/ntpdate.upstart - use ntpdate-wrapper here as well

glen glen at pld-linux.org
Mon Feb 27 22:21:27 CET 2012


Author: glen                         Date: Mon Feb 27 21:21:26 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use ntpdate-wrapper here as well

---- Files affected:
packages/ntp:
   ntpdate.upstart (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/ntp/ntpdate.upstart
diff -u packages/ntp/ntpdate.upstart:1.2 packages/ntp/ntpdate.upstart:1.3
--- packages/ntp/ntpdate.upstart:1.2	Sun Aug 14 13:08:01 2011
+++ packages/ntp/ntpdate.upstart	Mon Feb 27 22:21:21 2012
@@ -7,20 +7,9 @@
 start on pld.network-started
 stop on pld.shutdown-started
 
-env NTPDATE_USER="ntp"
-
 task
 
 # mark that ntpdate fail is ok (task marked as done and hwclock skipped)
 normal exit 0 1
 
-script
-	# Source old-style ntp service configuration
-	[ -f /etc/sysconfig/ntpdate ] && . /etc/sysconfig/ntpdate
-
-	/usr/sbin/ntpdate -s ${NTPDATE_USER:+-U $NTPDATE_USER} $NTPDATE_OPTIONS $NTPDATE_SERVERS
-
-	if [ "$SYNC_HWCLOCK" = "yes" ]; then
-		/sbin/hwclock --systohc
-	fi
-end script
+exec /usr/sbin/ntpdate-wrapper
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntpdate.upstart?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list