From 2aed1d967332608ecb6be3d98c85d17f37533811 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 8 Sep 2022 12:38:45 +0200 Subject: [PATCH] dhcpcd.exe: Run everything no matter how RED is configured This could potentially create problems when we abuse these functions to launch the DHCP client on IPTV interfaces. This would have to be tested and confirmed or potentially we would need some more changes to keep supporting that use-case, too. Signed-off-by: Michael Tremer --- src/initscripts/networking/dhcpcd.exe | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networking/dhcpcd.exe index 440a76693f..f6e494f962 100644 --- a/src/initscripts/networking/dhcpcd.exe +++ b/src/initscripts/networking/dhcpcd.exe @@ -34,7 +34,6 @@ dhcpcd_up() exit 0; fi - # Only if RED_TYPE=DHCP update /var/ipfire/red # Check if we have to restart the services at update [ ! -e "/var/ipfire/red/active" ] && update=1; if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then @@ -82,13 +81,12 @@ dhcpcd_down() # Remove DNS servers rm -f /var/run/dns1 /var/run/dns2 - # Only if RED_TYPE=DHCP update /var/ipfire/red - if [ "$RED_TYPE" == "DHCP" ]; then - rm -f /var/ipfire/red/active - 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 + # Consider RED to be no longer active + rm -f /var/ipfire/red/active + + 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 # Remove any configured IP address from the device -- 2.39.5