From 8511bee60cf26b222eab16a25dfa586f96aad86b Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 28 Jan 2004 21:02:24 +0000
Subject: clear out environment (#113937, #111584)

---
 rc.d/init.d/network | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'rc.d/init.d')

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index b43d05ab..a3aeb0e0 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -109,17 +109,21 @@ case "$1" in
 
 		if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then
 			cipeinterfaces="$cipeinterfaces $i"
+			unset DEVICE TYPE SLAVE
 			continue
 		fi
 		if [ "$TYPE" = "xDSL" ]; then
 		        xdslinterfaces="$xdslinterfaces $i"
+			unset DEVICE TYPE SLAVE
 			continue
 		fi
 		
 		if [ "$SLAVE" = "yes" ]; then
+			unset DEVICE TYPE SLAVE
 			continue
 		fi
 	
+		unset DEVICE TYPE SLAVE
 		if LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then
 		        # this loads the module, to preserve ordering
 			is_available $i
@@ -196,12 +200,15 @@ case "$1" in
 
 		if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then
 			cipeinterfaces="$cipeinterfaces $i"
+			unset DEVICE TYPE
 			continue
 		fi
 		if [ "$TYPE" = "xDSL" ]; then
 		        xdslinterfaces="$xdslinterfaces $i"
+			unset DEVICE TYPE
 			continue
 		fi
+		unset DEVICE TYPE
 	done
 	
 	for i in $cipeinterfaces $xdslinterfaces ; do
-- 
cgit v1.2.1