[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 829435bea3eee286cd1b1c73a81d53fcd0336c07

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 829435bea3eee286cd1b1c73a81d53fcd0336c07

[git]

[-- Attachment #1: Type: text/plain, Size: 2257 bytes --]

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  829435bea3eee286cd1b1c73a81d53fcd0336c07 (commit)
      from  3cf764f338da36c28b348c46db1dbbdff8c97d5b (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 829435bea3eee286cd1b1c73a81d53fcd0336c07
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Sep 27 20:15:53 2016 +0200

    ntp: fix wait for red if dhcp or wpasupplicant is running.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/106/filelists/files | 1 +
 src/initscripts/init.d/ntp                | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 02b9d4c..fdd8f89 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 a746c1e..d411ba1 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"


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