ntp: wait only if wpa_supplicant is running.

[people/teissler/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..548b4c4d05eca0d763aa9f8dab43b1a6592cee5b 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -1,17 +1,40 @@
 #!/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
 
+eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
+
 case "$1" in
        start)
+               if [ "$ENABLESETONBOOT" == "on" ]; then
+                       boot_mesg -n "Setting time on boot..."
+                       if [ $(pidof wpa_supplicant) ]; then
+                               if [ ! -e /var/ipfire/red/active ]; then
+                                       boot_mesg ""
+                                       boot_mesg -n "Wait for wlan"
+                                       for (( i=30; i>1; i-- )) do
+                                               if [ -e /var/ipfire/red/active ]; then
+                                                       break;
+                                               fi
+                                               boot_mesg -n "."
+                                               sleep 2
+                                       done
+                                       sleep 5
+                               fi
+                       fi
+                       if [ -e /var/ipfire/red/active ]; then
+                               boot_mesg ""
+                               loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
+                       else
+                               boot_mesg " ERROR! Not online!"
+                               echo_warning
+                       fi
+               fi
+
                boot_mesg "Starting ntpd..."
-               ntpd -gqx
-               loadproc /usr/bin/ntpd
+               loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid
                ;;
 
        stop)