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

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

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2194 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  4cd82be05f21bcf49e38793e41730923a0107a0b (commit)
      from  fd244f4327bcfb945d4a30d67e0634279a835e37 (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 4cd82be05f21bcf49e38793e41730923a0107a0b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jul 4 20:42:47 2019 +0200

    unbound: check if red/iface exists before read it
    
    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 ccb5fae21..5d3c5062f 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -48,7 +48,7 @@ config_header() {
 }
 
 update_forwarders() {
-	if [ "${USE_FORWARDERS}" = "1" -a "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ]; then
+	if [ "${USE_FORWARDERS}" = "1" -a -e "/var/ipfire/red/iface" -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 [ "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ]; then
+	if [ -e "/var/ipfire/red/iface" -a "$(</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