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 3ab3eece1f0f54269793af0691c99789436d63d2..a08d12e20c1c18fec95c85f09d1346edf4571bea 100644 (file)
--- 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 a2cdc66d257404c57cdad5013cda247bbfcbe751..5b1c5ab16c7fd4ad866edefe509b529f8b162605 100644 (file)
--- 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
 }