From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag 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 Message-ID: <20230829085241.6985-3-jonatan.schlag@ipfire.org> In-Reply-To: <20230829085241.6985-1-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7794563000818364713==" List-Id: --===============7794563000818364713== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 --- 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 =20 # RED if [ "$red" =3D=3D "1" ]; then - if [ "$CONFIG_TYPE" =3D "1" -o "$CONFIG_TYPE" =3D "2" -o "$CONFIG_TYPE" = =3D "3" -o "$CONFIG_TYPE" =3D "4" ]; then - # Remove possible leftover files - rm -f /var/ipfire/red/{active,device,dial-on-demand,dns1,dns2,local-ipad= dress,remote-ipaddress,resolv.conf} - [ "$AUTOCONNECT" =3D=3D "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-ipadd= ress,remote-ipaddress,resolv.conf} + [ "$AUTOCONNECT" =3D=3D "off" ] || /etc/rc.d/init.d/networking/red start fi =20 # Create IPsec interfaces --=20 2.39.2 --===============7794563000818364713==--