[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b3aa7a123136f35392cea2d37c91ffce1f416094

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b3aa7a123136f35392cea2d37c91ffce1f416094

[git]

[-- Attachment #1: Type: text/plain, Size: 2171 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  b3aa7a123136f35392cea2d37c91ffce1f416094 (commit)
      from  329e9c465ad41fd102ab5a59169e6ac569da7edf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b3aa7a123136f35392cea2d37c91ffce1f416094
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Feb 27 08:22:11 2014 +0100

    ntp: wait only if wpa_supplicant is running.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/ntp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index 885b610..548b4c4 100644
--- 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


hooks/post-receive
--
IPFire 2.x development tree