Enabled force setting system time on boot.

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / ntp

diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index 5cb6782ad7e5a4f3c7caf1eeee598dc8f621044c..ef94de153330e5a713acbadc13d149aaf50fdf0e 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -1,17 +1,20 @@
 #!/bin/sh
 # Begin $rc_base/init.d/ntp
 
 #!/bin/sh
 # Begin $rc_base/init.d/ntp
 

-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-

 . /etc/sysconfig/rc
 . $rc_functions
 
 . /etc/sysconfig/rc
 . $rc_functions
 

+eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
+

 case "$1" in
        start)
 case "$1" in
        start)

+               if [ "$ENABLESETONBOOT" == "on" ]; then
+                       boot_mesg "Setting time on booot..."
+                       loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
+               fi  
+

                boot_mesg "Starting ntpd..."
                boot_mesg "Starting ntpd..."

-               ntpd -gqx
-               loadproc /usr/bin/ntpd
+               loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid

                ;;
 
        stop)
                ;;
 
        stop)