public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/5] network initscripts: Remove code for old zone scheme
Date: Tue, 29 Aug 2023 10:52:39 +0200	[thread overview]
Message-ID: <20230829085241.6985-3-jonatan.schlag@ipfire.org> (raw)
In-Reply-To: <20230829085241.6985-1-jonatan.schlag@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]

A long time ago (2007) there were more config types possible then 1, 2, 3
and 4. As our installer currently only accepts config type out of the set
1, 2, 3 and 4 we do not need to check if our CONFIG_TYPE is in this set.

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 src/initscripts/system/network | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/initscripts/system/network b/src/initscripts/system/network
index 16609175a..ecc007a47 100644
--- a/src/initscripts/system/network
+++ b/src/initscripts/system/network
@@ -63,11 +63,9 @@ case "${DO}" in
 
 		# RED
 		if [ "$red" == "1" ]; then
-			if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
-				# Remove possible leftover files
-				rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
-				[ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
-			fi
+			# Remove possible leftover files
+			rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
+			[ "$AUTOCONNECT" == "off" ] || /etc/rc.d/init.d/networking/red start
 		fi
 
 		# Create IPsec interfaces
-- 
2.39.2


  parent reply	other threads:[~2023-08-29  8:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-29  8:52 [PATCH 1/5] Remove Start/Stop links for client175 Jonatan Schlag
2023-08-29  8:52 ` [PATCH 2/5] Use bash as shebang in network initscripts Jonatan Schlag
2023-08-29  8:52 ` Jonatan Schlag [this message]
2023-08-29  8:52 ` [PATCH 4/5] network scripts: remove check for AUTOCONNECT Jonatan Schlag
2023-08-29  8:52 ` [PATCH 5/5] network startup: Always cleanup before red gets started Jonatan Schlag

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230829085241.6985-3-jonatan.schlag@ipfire.org \
    --to=jonatan.schlag@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox