- use ntpdate-wrapper here as well

Changed files:
    ntpdate.upstart -> 1.3

diff --git a/ntpdate.upstart b/ntpdate.upstart
index 58f5c44bc74d5b1dfa768c9a26ea23d4523c41c7..2f55a120ac5c2c00dbaa439cd0f4fce7db8df424 100644 (file)
--- a/ntpdate.upstart
+++ b/ntpdate.upstart
@@ -7,20 +7,9 @@ description "Synchronizes time with ntpdate (NTP client)"
 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