From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 04/29] dhcpcd.exe: Allow using the DHCP setup scripts when RED
 is not configured as DHCP
Date: Thu, 01 Dec 2022 17:22:53 +0000
Message-ID: <20221201172318.3166615-4-michael.tremer@ipfire.org>
In-Reply-To: <20221201172318.3166615-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3858480929836017448=="
List-Id: <development.lists.ipfire.org>

--===============3858480929836017448==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
---
 src/initscripts/networking/dhcpcd.exe | 42 +++++++++++++--------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/initscripts/networking/dhcpcd.exe b/src/initscripts/networki=
ng/dhcpcd.exe
index 38632aa61..8a409d010 100644
--- a/src/initscripts/networking/dhcpcd.exe
+++ b/src/initscripts/networking/dhcpcd.exe
@@ -34,32 +34,30 @@ dhcpcd_up()
 	fi
=20
 	# Only if RED_TYPE=3DDHCP update /var/ipfire/red
-	if [ "$RED_TYPE" =3D=3D "DHCP" ]; then
-		# Check if we have to restart the services at update
-		[ ! -e "/var/ipfire/red/active" ] && update=3D1;
-		if [ "$old_domain_name_service" !=3D "$new_domain_name_service" ]; then
-			update=3D1;
-		fi
-		if [ "$old_ip_address" !=3D "$new_ip_address" ]; then
-			update=3D1;
-		fi
-		if [ "$old_routers" !=3D "$new_routers" ]; then
-			update=3D1;
-		fi
+	# Check if we have to restart the services at update
+	[ ! -e "/var/ipfire/red/active" ] && update=3D1;
+	if [ "$old_domain_name_service" !=3D "$new_domain_name_service" ]; then
+		update=3D1;
+	fi
+	if [ "$old_ip_address" !=3D "$new_ip_address" ]; then
+		update=3D1;
+	fi
+	if [ "$old_routers" !=3D "$new_routers" ]; then
+		update=3D1;
+	fi
=20
-		# 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 DNS from dhcp
+	/etc/rc.d/helper/getdnsfromdhcpc.pl 1 > /var/run/dns1
+	/etc/rc.d/helper/getdnsfromdhcpc.pl 2 > /var/run/dns2
=20
-		#Get IP Address
-		echo -n "$new_ip_address"  > /var/ipfire/red/local-ipaddress
+	#Get IP Address
+	echo -n "$new_ip_address"  > /var/ipfire/red/local-ipaddress
=20
-		#Get default gateway
-		grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
-		echo "$new_routers	gateway"  >> /tmp/hosts
-		mv /tmp/hosts /etc/hosts
+	#Get default gateway
+	grep -v -E "\<gateway\>" /etc/hosts > /tmp/hosts
+	echo "$new_routers	gateway"  >> /tmp/hosts
+	mv /tmp/hosts /etc/hosts
=20
-	fi
 	if [ $update ]; then
 		[ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active
 		echo -n "$new_routers" > /var/ipfire/red/remote-ipaddress
--=20
2.30.2


--===============3858480929836017448==--