From 829435bea3eee286cd1b1c73a81d53fcd0336c07 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 27 Sep 2016 20:15:53 +0200 Subject: [PATCH] ntp: fix wait for red if dhcp or wpasupplicant is running. Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/106/filelists/files | 1 + src/initscripts/init.d/ntp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files index 02b9d4c0b5..fdd8f89050 100644 --- 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 a746c1eb0f..d411ba18d6 100644 --- 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" -- 2.39.5