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 <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-12-01 17:23:09 +00:00
committed by Peter Müller
parent 7a67f77f10
commit c2e2c2824a

View File

@@ -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,14 +81,13 @@ 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
# 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
fi
# Remove any configured IP address from the device
ip addr flush dev "${interface}" &>/dev/null