ntp: wait only if wpa_supplicant is running.

diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index 885b610b4d197f832eec3f05aa6917208d09c265..548b4c4d05eca0d763aa9f8dab43b1a6592cee5b 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -10,23 +10,25 @@ case "$1" in
        start)
                if [ "$ENABLESETONBOOT" == "on" ]; then
                        boot_mesg -n "Setting time on boot..."
-                       if [ ! -e /var/ipfire/red/active ]; then
-                               boot_mesg ""
-                               boot_mesg -n "Wait for online connection"
-                               for (( i=30; i>1; i-- )) do
-                                       if [ -e /var/ipfire/red/active ]; then
-                                               break;
-                                       fi
-                                       boot_mesg -n "."
-                                       sleep 1
-                               done
-                               sleep 5
+                       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 " not online!"
+                               boot_mesg " ERROR! Not online!"
                                echo_warning
                        fi
                fi