From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 1 Dec 2019 13:03:46 +0000 (+0100)
Subject: 70-dhcpdd.exe: don't run red.down scripts at "PREINIT"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=455291f90e0729ad8a8edc743d4375f782728ad3;p=people%2Fstevee%2Fipfire-2.x.git

70-dhcpdd.exe: don't run red.down scripts at "PREINIT"

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

diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/core/139/filelists/files
index 3ab3eece1f..a08d12e20c 100644
--- a/config/rootfiles/core/139/filelists/files
+++ b/config/rootfiles/core/139/filelists/files
@@ -5,6 +5,7 @@ var/ipfire/langs
 etc/httpd/conf/vhosts.d/ipfire-interface.conf
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/dhcpcd.exe
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/networking/red.up/23-suricata
diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index a2cdc66d25..5b1c5ab16c 100644
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -78,9 +78,11 @@ dhcpcd_down()
 
 	# Only if RED_TYPE=DHCP update /var/ipfire/red
 	if [ "$RED_TYPE" == "DHCP" ]; then
-		logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
 		rm -f /var/ipfire/red/active
-		run_subdir ${rc_base}/init.d/networking/red.down/
+		if [ ! $reason == "PREINIT" ]; then
+			logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down"
+			run_subdir ${rc_base}/init.d/networking/red.down/
+		fi
 	fi
 }