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 b3cd418fa3a12682ce7baa14d70c03cfaca91fa2..c0fe24912664a8798b3331d1ca3e7932ff620208 100644 (file)
--- 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 548b4c4d05eca0d763aa9f8dab43b1a6592cee5b..a746c1eb0ff377a5a48d71e51fb1323654ab880b 100644 (file)
--- 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;