[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 05478072cd8faee443ceadb1ebfac11057bd6dc1

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 05478072cd8faee443ceadb1ebfac11057bd6dc1

[git]

[-- Attachment #1: Type: text/plain, Size: 3114 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  05478072cd8faee443ceadb1ebfac11057bd6dc1 (commit)
      from  874eabd6f57f8ad894b237d1a1fc029096070163 (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 05478072cd8faee443ceadb1ebfac11057bd6dc1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Aug 15 20:20:16 2017 +0200

    unbound/ntp: move not working DNS fallback from ntp to unbound initskript
    
    the ntp initskript will only run at first connection try. If this fails
    and the connection can established later DNS will not work if the clock
    is too far away.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/113/filelists/files |  2 ++
 src/initscripts/system/ntp                |  8 --------
 src/initscripts/system/unbound            | 10 ++++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/113/filelists/files b/config/rootfiles/core/113/filelists/files
index 168c7d1..ceed6de 100644
--- a/config/rootfiles/core/113/filelists/files
+++ b/config/rootfiles/core/113/filelists/files
@@ -1,3 +1,5 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/ntp
+etc/rc.d/init.d/unbound
 var/ipfire/langs
diff --git a/src/initscripts/system/ntp b/src/initscripts/system/ntp
index 0793927..d411ba1 100644
--- a/src/initscripts/system/ntp
+++ b/src/initscripts/system/ntp
@@ -27,14 +27,6 @@ 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!"
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 7437d93..3002f48 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -484,6 +484,16 @@ case "$1" in
 
 		# Update hosts
 		update_hosts
+
+		# If DNS still not work try to init ntp with
+		# hardcoded ntp.ipfire.org (81.3.27.46)
+		if [ -e /var/ipfire/red/active ]; then
+			host 0.ipfire.pool.ntp.org > /dev/null 2>&1
+			if [ "${?}" != "0" ]; then
+				boot_mesg "DNS still not work ... init time with ntp.ipfire.org at 81.3.27.46 ..."
+				loadproc /usr/local/bin/settime 81.3.27.46
+			fi
+		fi
 		;;
 
 	stop)


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