Merge branch 'next'

[ipfire-2.x.git] / src / initscripts / networking / dhcpcd.exe

diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe
index a2cdc66d257404c57cdad5013cda247bbfcbe751..28d62a14ea4c8f19421d6f0f0b7b1ec72c672504 100644 (file)
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -5,7 +5,7 @@
 #
 # Authors     : Arne Fitzenreiter - arne_f@ipfire.org
 #
-# Version     : 02.00
+# Version     : 02.10
 #
 # Notes       : 
 #
@@ -78,13 +78,15 @@ 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 ($reason)"
+                       run_subdir ${rc_base}/init.d/networking/red.down/
+               fi
        fi
 }
 
 case "$reason" in
 BOUND|INFORM|REBIND|REBOOT|RENEW|TIMEOUT|STATIC)       dhcpcd_up;;
-PREINIT|EXPIRE|FAIL|IPV4LL|NAK|NOCARRIER|RELEASE|STOP) dhcpcd_down;;
+PREINIT|EXPIRE|FAIL|IPV4LL|NAK|RELEASE|STOP)           dhcpcd_down;;
 esac