webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 10:35:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

dhcpcd.exe: Run everything no matter how RED is configured

Browse Source 
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
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/initscripts/networking/dhcpcd.exe
View File

@@ -34,7 +34,6 @@ dhcpcd_up()
exit 0; exit 0;
fi fi
# Only if RED_TYPE=DHCP update /var/ipfire/red
# Check if we have to restart the services at update # Check if we have to restart the services at update
[ ! -e "/var/ipfire/red/active" ] && update=1; [ ! -e "/var/ipfire/red/active" ] && update=1;
if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then if [ "$old_domain_name_service" != "$new_domain_name_service" ]; then
@@ -82,13 +81,12 @@ dhcpcd_down()
# Remove DNS servers # Remove DNS servers
rm -f /var/run/dns1 /var/run/dns2 rm -f /var/run/dns1 /var/run/dns2
# Only if RED_TYPE=DHCP update /var/ipfire/red # Consider RED to be no longer active
if [ "$RED_TYPE" == "DHCP" ]; then rm -f /var/ipfire/red/active
rm -f /var/ipfire/red/active
if [ ! $reason == "PREINIT" ]; then if [ ! $reason == "PREINIT" ]; then
logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)" logger -p local0.info -t dhcpcd.exe[$$] "${interface} has been brought down ($reason)"
run_subdir ${rc_base}/init.d/networking/red.down/ run_subdir ${rc_base}/init.d/networking/red.down/
fi
fi fi
# Remove any configured IP address from the device # Remove any configured IP address from the device