Fix fuer Red-Static.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@752 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/initscripts/init.d/net/common/ipv4-static b/src/initscripts/init.d/net/common/ipv4-static
index 081e0adbab09a693bdc0d6a240a93b475279e755..62a131037f667c08e88a704dee1dfe6628dd94ee 100644 (file)
--- a/src/initscripts/init.d/net/common/ipv4-static
+++ b/src/initscripts/init.d/net/common/ipv4-static
@@ -49,8 +49,8 @@ case "${2}" in
                                ip route add default via ${GATEWAY} dev ${1}
                                evaluate_retval
                                 if [ "${DNS1}" != "" ];then
-                               boot_mesg "Registering DNS Server for green only..."
-                               echo "nameserver $DNS1" > /etc/resolv.conf
+                                       boot_mesg "Registering DNS Server for green only..."
+                                       echo "nameserver $DNS1" > /etc/resolv.conf
                                 fi
                                 if [ "${DNS2}" != "" ];then
                                  echo "nameserver $DNS2" >> /etc/resolv.conf
@@ -77,8 +77,8 @@ case "${2}" in
                fi
                
                if [ "${CONFIG_TYPE}" == "0" ] || [ "${CONFIG_TYPE}" == "" ]; then
-               boot_mesg "Restoring default DNS Proxy Adress in resolv.conf..."
-               echo "nameserver 127.0.0.1" > /etc/resolv.conf
+                       boot_mesg "Restoring default DNS Proxy Adress in resolv.conf..."
+                       echo "nameserver 127.0.0.1" > /etc/resolv.conf
     fi
        
                boot_mesg "Removing IPv4 address ${ADDRESS} from the ${1} interface..."

diff --git a/src/initscripts/init.d/net/ifdown b/src/initscripts/init.d/net/ifdown
index 039281c6f6e2085742c164d0cdeb38e444462a45..a24d1e0eca6eae6707951e467a7d28daea27a0f3 100644 (file)
--- a/src/initscripts/init.d/net/ifdown
+++ b/src/initscripts/init.d/net/ifdown
@@ -63,7 +63,7 @@ then
                
                ### Cleanup the system when red goes down ###
                /usr/local/bin/dialctrl.pl down
-               rm -f /var/ipfire/red/iface
+               rm -f /var/ipfire/red/{active,iface,*-ipaddress,dns*}
                
        fi
 else

diff --git a/src/initscripts/init.d/net/ifup b/src/initscripts/init.d/net/ifup
index d565fcf374af1679ae9302c6908e74af4da3b79e..0eef77933f64d4a5b0d3910a091ec6161f6215e9 100644 (file)
--- a/src/initscripts/init.d/net/ifup
+++ b/src/initscripts/init.d/net/ifup
@@ -88,6 +88,7 @@ boot_mesg_flush
                        NETADDRESS=${RED_NETADDRESS} BROADCAST=${RED_BROADCAST} \
                        DNS1=${DNS1} DNS2=${DNS2} GATEWAY=${DEFAULT_GATEWAY} \
                        /etc/rc.d/init.d/net/common/ipv4-static ${RED_DEV} up
+                       touch /var/ipfire/red/active
                fi
                
                /usr/local/bin/dialctrl.pl up