From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 18 Mar 2016 18:26:39 +0000 (+0100)
Subject: ntp: wait for connection if dhcpcd is running
X-Git-Tag: v2.19-core100~4
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=96e31c9817f1ee3bec3fe33ecae7a84ff7e4ffff

ntp: wait for connection if dhcpcd is running

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files
index b3cd418fa3..c0fe249126 100644
--- a/config/rootfiles/core/100/filelists/files
+++ b/config/rootfiles/core/100/filelists/files
@@ -5,6 +5,7 @@ etc/ppp/ip-up
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/functions
 etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/ntp
 etc/modprobe.d/nf_conntrack.conf
 lib/udev/rules.d/60-net.rules
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index 548b4c4d05..a746c1eb0f 100644
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -10,10 +10,10 @@ case "$1" in
 	start)
 		if [ "$ENABLESETONBOOT" == "on" ]; then
 			boot_mesg -n "Setting time on boot..."
-			if [ $(pidof wpa_supplicant) ]; then
+			if [ $(pidof wpa_supplicant dhcpcd) ]; then
 				if [ ! -e /var/ipfire/red/active ]; then
 					boot_mesg ""
-					boot_mesg -n "Wait for wlan"
+					boot_mesg -n "Waiting for red connection"
 					for (( i=30; i>1; i-- )) do
 						if [ -e /var/ipfire/red/active ]; then
 							break;