[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4b75e9c92edffca7f3935dfe0c6500038df5c80a

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2288 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  4b75e9c92edffca7f3935dfe0c6500038df5c80a (commit)
      from  527d14bf5a2f0f3fc1923efc235a39fe50fb97b7 (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 4b75e9c92edffca7f3935dfe0c6500038df5c80a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Jun 29 11:36:49 2019 +0200

    unbound: use nic carrier instead of /var/ipfire/red/active
    
    This speed boot with static settings and no link and
    dhcp on intel nics if the mtu is changed by the dhcp lease
    because the nic loose the carrier and restart the dhcp action
    at mtu set.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 src/initscripts/system/unbound | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 34b3e06fd..ccb5fae21 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -48,7 +48,7 @@ config_header() {
 }
 
 update_forwarders() {
-	if [ "${USE_FORWARDERS}" = "1" -a -e "/var/ipfire/red/active" ]; then
+	if [ "${USE_FORWARDERS}" = "1" -a "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ]; then
 		local forwarders
 		local broken_forwarders
 
@@ -473,7 +473,7 @@ disable_dnssec() {
 fix_time_if_dns_fail() {
 	# 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
+	if [ "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ]; then
 		host 0.ipfire.pool.ntp.org > /dev/null 2>&1
 		if [ "${?}" != "0" ]; then
 			boot_mesg "DNS still not functioning... Trying to sync time with ntp.ipfire.org (81.3.27.46)..."


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