ntp: check/wait for onlineconnection.

diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index 92f174d8afdd356d3689856ccad5acd2d35bf2b4..885b610b4d197f832eec3f05aa6917208d09c265 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -9,9 +9,27 @@ eval $(/usr/local/bin/readhash /var/ipfire/time/settings)
 case "$1" in
        start)
                if [ "$ENABLESETONBOOT" == "on" ]; then
 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 [ ! -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
+                       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!"
+                               echo_warning
+                       fi
+               fi

 
                boot_mesg "Starting ntpd..."
                loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid
 
                boot_mesg "Starting ntpd..."
                loadproc /usr/bin/ntpd -Ap /var/run/ntpd.pid