Config types auf ist Zustand gebogen ... hoffentlich ...

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / network

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index c348c5de663105b885ff20c5893a0c7c44eff09d..a0d40a6d3720e67090dbca5ada14ce6002654741 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -73,7 +73,7 @@ case "${DO}" in
                        boot_mesg "Setting IPFire DMZ pinholes"
                        /usr/local/bin/setdmzholes; evaluate_retval
        
-                       if [ "$CONFIG_TYPE" = "4" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+                       if [ "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
                                boot_mesg "Setting up wireless firewall rules"
                                /usr/local/bin/restartwireless; evaluate_retval
                        fi
@@ -96,21 +96,21 @@ case "${DO}" in
                
                # BLUE
                if [ "$blue" == "1" ]; then
-                       if [ "$CONFIG_TYPE" = "4" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+                       if [ "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
                                name=blue /etc/rc.d/init.d/net/ifup
                        fi
                fi
                
                # ORANGE
                if [ "$orange" == "1" ]; then
-                       if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "7" ]; then
+                       if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "4" ]; then
                                name=orange /etc/rc.d/init.d/net/ifup
                        fi
                fi
                
                # RED
                if [ "$red" == "1" ]; then
-                       if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; 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}
                                if [ "$AUTOCONNECT" == "off" ]; then
@@ -131,21 +131,21 @@ case "${DO}" in
                
                # BLUE
                if [ "$blue" == "1" ]; then
-                       if [ "$CONFIG_TYPE" = "4" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+                       if [ "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
                                name=blue /etc/rc.d/init.d/net/ifdown
                        fi
                fi
                
                # ORANGE
                if [ "$orange" == "1" ]; then
-                       if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "5" -o "$CONFIG_TYPE" = "7" ]; then
+                       if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "4" ]; then
                                name=orange /etc/rc.d/init.d/net/ifdown
                        fi
                fi
                
                # RED
                if [ "$red" == "1" ]; then
-                       if [ "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "6" -o "$CONFIG_TYPE" = "7" ]; then
+                       if [ "$CONFIG_TYPE" = "1" -o "$CONFIG_TYPE" = "2" -o "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
                                name=red /etc/rc.d/init.d/net/ifdown
                        fi
                fi