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: Allow using the DHCP setup scripts when RED is not configured as DHCP

Browse Source 
This is useful for dial-up methods that use DHCP, but when RED_TYPE is
configured as PPP.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2022-12-01 17:22:53 +00:00
committed by Peter Müller
parent 177ec16705
commit 33d2aa6d02
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,32 +34,30 @@ dhcpcd_up()
fi
# Only if RED_TYPE=DHCP update /var/ipfire/red
if [ "$RED_TYPE" == "DHCP" ]; then
# 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
update=1;
fi
if [ "$old_ip_address" != "$new_ip_address" ]; then
update=1;
fi
if [ "$old_routers" != "$new_routers" ]; then
update=1;
fi
# Get DNS from dhcp
/etc/rc.d/helper/getdnsfromdhcpc.pl 1 > /var/run/dns1
/etc/rc.d/helper/getdnsfromdhcpc.pl 2 > /var/run/dns2
#Get IP Address
echo -n "$new_ip_address" > /var/ipfire/red/local-ipaddress
#Get default gateway
grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
echo "$new_routers gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
# 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
update=1;
fi
if [ "$old_ip_address" != "$new_ip_address" ]; then
update=1;
fi
if [ "$old_routers" != "$new_routers" ]; then
update=1;
fi
# Get DNS from dhcp
/etc/rc.d/helper/getdnsfromdhcpc.pl 1 > /var/run/dns1
/etc/rc.d/helper/getdnsfromdhcpc.pl 2 > /var/run/dns2
#Get IP Address
echo -n "$new_ip_address" > /var/ipfire/red/local-ipaddress
#Get default gateway
grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
echo "$new_routers gateway" >> /tmp/hosts
mv /tmp/hosts /etc/hosts
if [ $update ]; then
[ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
echo -n "$new_routers" > /var/ipfire/red/remote-ipaddress