ntp: fix wait for red if dhcp or wpasupplicant is running.

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

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 02b9d4c0b59e0bcd424eac82c6672e4bcb0277d6..fdd8f890501ff122e30f1b430e9d4bba19954160 100644 (file)
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -4,6 +4,7 @@ etc/rc.d/init.d/dhcp
 etc/rc.d/init.d/network
 etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
 etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
+etc/rc.d/init.d/ntp
 etc/rc.d/init.d/unbound
 etc/rc.d/rc0.d/K79unbound
 etc/rc.d/rc3.d/S21unbound

diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index a746c1eb0ff377a5a48d71e51fb1323654ab880b..d411ba18d6f66108df695e1a0c2f192db7255c09 100644 (file)
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -10,7 +10,8 @@ case "$1" in
        start)
                if [ "$ENABLESETONBOOT" == "on" ]; then
                        boot_mesg -n "Setting time on boot..."
-                       if [ $(pidof wpa_supplicant dhcpcd) ]; then
+                       pidof wpa_supplicant dhcpcd 2>&1 > /dev/null
+                       if [ "${?}" == "0" ]; then
                                if [ ! -e /var/ipfire/red/active ]; then
                                        boot_mesg ""
                                        boot_mesg -n "Waiting for red connection"