From 97aa4ba2e6580e523ca3ef0770570ac5492dad4b Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Thu, 9 Aug 2007 17:12:34 +0000
Subject: [PATCH] Fix fuer Red-Static.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@752 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 src/initscripts/init.d/net/common/ipv4-static | 8 ++++----
 src/initscripts/init.d/net/ifdown             | 2 +-
 src/initscripts/init.d/net/ifup               | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/initscripts/init.d/net/common/ipv4-static b/src/initscripts/init.d/net/common/ipv4-static
index 081e0adba..62a131037 100644
--- 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 039281c6f..a24d1e0ec 100644
--- 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 d565fcf37..0eef77933 100644
--- 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