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 96e31c9817f1ee3bec3fe33ecae7a84ff7e4ffff (commit) from 8a148bbc5a9de80edb36fad91cd3f0e6ca3155a1 (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 96e31c9817f1ee3bec3fe33ecae7a84ff7e4ffff Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Mar 18 19:26:39 2016 +0100

ntp: wait for connection if dhcpcd is running

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

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

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

Difference in files: diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files index b3cd418..c0fe249 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 548b4c4..a746c1e 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;

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