From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 0a79ec45053014034d3ec947d625463ebdf956db
Date: Sun, 23 Feb 2014 18:29:21 +0100
Message-ID: <20140223172921.7FF9D208ED@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6773557020832821378=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6773557020832821378==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

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  0a79ec45053014034d3ec947d625463ebdf956db (commit)
      from  582fa1555574ac0b6abc0a4daee906d1a9a091ef (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 0a79ec45053014034d3ec947d625463ebdf956db
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Feb 23 18:28:34 2014 +0100

    ntp: check/wait for onlineconnection.

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

Summary of changes:
 src/initscripts/init.d/ntp | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

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


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

--===============6773557020832821378==--