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 92f174d8afdd356d3689856ccad5acd2d35bf2b4..548b4c4d05eca0d763aa9f8dab43b1a6592cee5b 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -9,9 +9,29 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
 case "$1" in
        start)
                if [ "$ENABLESETONBOOT" == "on" ]; then
-                       boot_mesg "Setting time on boot..."
-                       loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
-               fi  
+                       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..."
                loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid