From 53d91a6936d3d65aa1f71ff792b2c906426d2f31 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 28 Jan 2004 21:00:22 +0000 Subject: clear out environment (#113937, #111584) --- rc.d/init.d/network | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'rc.d/init.d/network') diff --git a/rc.d/init.d/network b/rc.d/init.d/network index 9452deeb..f4b46f25 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -111,21 +111,26 @@ case "$1" in if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then cipeinterfaces="$cipeinterfaces $i" + unset DEVICE TYPE SLAVE BRIDGE continue fi if [ "$TYPE" = "xDSL" ]; then xdslinterfaces="$xdslinterfaces $i" + unset DEVICE TYPE SLAVE BRIDGE continue fi if [ -n "$BRIDGE" ]; then bridgeinterfaces="$bridgeinterfaces $i" + unset DEVICE TYPE SLAVE BRIDGE continue fi if [ "$SLAVE" = "yes" ]; then + unset DEVICE TYPE SLAVE BRIDGE continue fi + unset DEVICE TYPE SLAVE BRIDGE if LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then # this loads the module, to preserve ordering @@ -206,16 +211,20 @@ case "$1" in if [ "${DEVICE##cipcb}" != "$DEVICE" ] ; then cipeinterfaces="$cipeinterfaces $i" + unset DEVICE TYPE BRIDGE continue fi if [ -n "$BRIDGE" ]; then bridgeinterfaces="$bridgeinterfaces $i" + unset DEVICE TYPE BRIDGE continue fi if [ "$TYPE" = "xDSL" ]; then xdslinterfaces="$xdslinterfaces $i" + unset DEVICE TYPE BRIDGE continue fi + unset DEVICE TYPE BRIDGE done for i in $cipeinterfaces $xdslinterfaces $bridgeinterfaces ; do -- cgit v1.2.1