packages: ntp/ntp-client.init - restore the background feature

[glen]

Author: glen                         Date: Mon Feb  1 17:14:36 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore the background feature

---- Files affected:
packages/ntp:
   ntp-client.init (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/ntp/ntp-client.init
diff -u packages/ntp/ntp-client.init:1.9 packages/ntp/ntp-client.init:1.10
--- packages/ntp/ntp-client.init:1.9	Fri Jan 22 20:40:54 2010
+++ packages/ntp/ntp-client.init	Mon Feb  1 18:14:31 2010
@@ -27,19 +27,21 @@
 	exit 0
 fi
 
-start() {
-	show "Syncing time with ntpdate"
-	daemon /usr/sbin/ntpdate -s ${NTPDATE_USER:+-U $NTPDATE_USER} $NTPDATE_OPTIONS $NTPDATE_SERVERS
-	RETVAL=$?
-	if [ $RETVAL -eq 0 ]; then
-	   	touch /var/lock/subsys/ntpdate
-		if is_yes "$SYNC_HWCLOCK"; then
-			show "Syncing hardware clock to system time"
-		    /sbin/hwclock --systohc && ok || fail
-		fi
+ntpdate_background() {
+	/usr/sbin/ntpdate -s ${NTPDATE_USER:+-U $NTPDATE_USER} $NTPDATE_OPTIONS $NTPDATE_SERVERS || return $?
+
+	if is_yes "$SYNC_HWCLOCK"; then
+		/sbin/hwclock --systohc
 	fi
 }
 
+start() {
+	show "Syncing time with ntpdate (backgrounding)"
+	ntpdate_background &
+	touch /var/lock/subsys/ntpdate
+	ok
+}
+
 stop() {
 	rm -f /var/lock/subsys/ntpdate
 }
@@ -58,7 +60,7 @@
 	start
 	;;
 cronsettime)
-	is_yes "$NTPDATE_CRON" && /usr/sbin/ntpdate -s ${NTPDATE_USER:+-U $NTPDATE_USER} $NTPDATE_OPTIONS $NTPDATE_SERVERS > /dev/null 2>&1
+	is_yes "$NTPDATE_CRON" && /usr/sbin/ntpdate -s ${NTPDATE_USER:+-U $NTPDATE_USER} $NTPDATE_OPTIONS $NTPDATE_SERVERS
 	RETVAL=$?
 	;;
 *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp-client.init?r1=1.9&r2=1.10&f=u