]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
network initscripts: Remove code for old zone scheme
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Tue, 29 Aug 2023 08:52:39 +0000 (10:52 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Sep 2023 15:15:53 +0000 (15:15 +0000)
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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/initscripts/system/network

index 16609175ad1074f5334e86258c3f4fa4b2f01931..ecc007a472d7bb20370b4361d1471bd32c49c2d0 100644 (file)
@@ -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