From: Jonatan Schlag <jonatan.schlag@ipfire.org>
Date: Fri, 31 Dec 2021 09:41:21 +0000 (+0100)
Subject: network startup: Always cleanup before red gets started
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fimprove_network_startup_prep_1;p=people%2Fjschlag%2Fipfire-2.x.git

network startup: Always cleanup before red gets started

There is no sense in doing this only in /etc/init.d/network
and not in /etc/init.d/networking/red

This files should be always deleted before a startup

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
---

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 9da3ea406d..beb665e5f4 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -80,6 +80,9 @@ fi
 
 case "${1}" in
 	start)
+		# Remove possible leftover files
+		rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
+
 		if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
 			boot_mesg "Bringing up the ${DEVICE} interface..."
 			boot_mesg_flush
diff --git a/src/initscripts/system/network b/src/initscripts/system/network
index b38c3836cb..0dcce060fb 100644
--- a/src/initscripts/system/network
+++ b/src/initscripts/system/network
@@ -62,11 +62,7 @@ case "${DO}" in
 			/etc/rc.d/init.d/networking/orange start
 
 		# RED
-		if [ "$red" == "1" ]; then
-			# Remove possible leftover files
-			rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
-			/etc/rc.d/init.d/networking/red start
-		fi
+		[ "$red" == "1" ] && /etc/rc.d/init.d/networking/red start
 
 		# Create IPsec interfaces
 		/usr/local/bin/ipsec-interfaces