From: Jonatan Schlag Date: Tue, 29 Aug 2023 08:52:39 +0000 (+0200) Subject: network initscripts: Remove code for old zone scheme X-Git-Tag: v2.27-core180~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=100cd24a17e109b3012d676dbeeabc62145bedba;p=ipfire-2.x.git network initscripts: Remove code for old zone scheme 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 Signed-off-by: Michael Tremer --- diff --git a/src/initscripts/system/network b/src/initscripts/system/network index 16609175ad..ecc007a472 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