[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2d646e983864558cbf50a0e2150b080a70976d8b

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2d646e983864558cbf50a0e2150b080a70976d8b

[git]

[-- Attachment #1: Type: text/plain, Size: 2397 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, master has been updated
       via  2d646e983864558cbf50a0e2150b080a70976d8b (commit)
      from  d4af85f252c5e1573f548377ea97928adf07c4d0 (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 2d646e983864558cbf50a0e2150b080a70976d8b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Nov 4 19:31:07 2016 +0100

    ntp: init with hardcoded ip if dns not work
    
    DNSSec need the correct time to validate the zones so we need
    a workaround to init the time without dns.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/107/filelists/files | 1 +
 src/initscripts/init.d/ntp                | 8 ++++++++
 2 files changed, 9 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/107/filelists/files b/config/rootfiles/core/107/filelists/files
index 226f45b..94704cf 100644
--- a/config/rootfiles/core/107/filelists/files
+++ b/config/rootfiles/core/107/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 etc/unbound/unbound.conf
 etc/rc.d/init.d/unbound
+etc/rc.d/init.d/ntp
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/traffic.cgi
 var/ipfire/langs
diff --git a/src/initscripts/init.d/ntp b/src/initscripts/init.d/ntp
index d411ba1..0793927 100644
--- a/src/initscripts/init.d/ntp
+++ b/src/initscripts/init.d/ntp
@@ -27,6 +27,14 @@ case "$1" in
 			fi
 			if [ -e /var/ipfire/red/active ]; then
 				boot_mesg ""
+
+				host ping.ipfire.org > /dev/null 2>&1
+				if [ "${?}" != "0" ]; then
+					boot_mesg "DNS not work ... init with ntp.ipfire.org at 81.3.27.46 ..."
+					loadproc /usr/local/bin/settime 81.3.27.46
+					boot_mesg "Setting time on boot..."
+				fi
+
 				loadproc /usr/local/bin/settime $(cat /var/ipfire/time/settime.conf)
 			else
 				boot_mesg " ERROR! Not online!"


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