split out ifup/ifdown general case to ifup/ifdown-eth; add ifup/ifdown-bnep (<dwmw2@redhat.com>)

1 files changed, 3 insertions, 97 deletions

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index ce7fb753..e4635fe5 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -40,102 +40,8 @@ fi
 
 OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-${DEVICETYPE}"
 
-if [ -x $OTHERSCRIPT ]; then
-	exec $OTHERSCRIPT $CONFIG $2
+if [ ! -x ${OTHERSCRIPT} ]; then
+    OTHERSCRIPT="/etc/sysconfig/network-scripts/ifdown-eth"
 fi
 
-if [ -n "${BRIDGE}" -a -x /usr/sbin/brctl ]; then
-      /sbin/ip link set dev ${DEVICE} down
-      /usr/sbin/brctl delif ${BRIDGE} ${DEVICE}
-      # Upon removing a device from a bridge,
-      # it's necessary to make radvd reload its config
-      [ -r /var/run/radvd/radvd.pid ] && kill -HUP `cat /var/run/radvd/radvd.pid`
-      exit 0
-fi 
-
-. /etc/sysconfig/network
-
-# Check to make sure the device is actually up
-check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && [ -n "$VLAN" -a "$VLAN" != "yes" ] && exit 0
-
-if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then
-    FOUNDMACADDR=`get_hwaddr ${REALDEVICE}`
-    if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then
-        NEWCONFIG=`LANG=C grep -il "^[[:space:]]*HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*`
-	if [ -n "${NEWCONFIG}" -a "${NEWCONFIG}" != "${CONFIG}" ]; then
-	   exec /sbin/ifdown ${NEWCONFIG}
-	else
-	   echo $"Device ${DEVICE} has different MAC address than expected, ignoring."
-	   exit 1
-	fi
-    fi
-fi
-
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifdown-ipv6 ${CONFIG}
-    if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -f /var/run/dhcp6c_${DEVICE}.pid ]; then
-       kill `cat /var/run/dhcp6c_${DEVICE}.pid`;
-       rm -f /var/run/dhcp6c_${DEVICE}.pid;
-    fi;	
-fi;
-
-retcode=0
-[ -n "`pidof -x dhclient`" ] && {
-	if [ -f "/var/run/dhclient-${DEVICE}.pid" ]; then
-		if [[ "$DHCPRELEASE" = [yY1]* ]];  then
-			/sbin/dhclient -r -lf /var/lib/dhcp/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid ${DEVICE} >/dev/null 2>&1
-		else
-		   	reason=STOP interface=${DEVICE} /sbin/dhclient-script
-		fi
-		kill `cat /var/run/dhclient-${DEVICE}.pid` >/dev/null 2>&1
-		retcode=$?
-		rm -f /var/run/dhclient-${DEVICE}.pid
-	fi
-}	
-# we can't just delete the configured address because that address
-# may have been changed in the config file since the device was
-# brought up.  Flush all addresses associated with this
-# instance instead.
-if [ "${REALDEVICE}" = "${DEVICE}" ]; then
-	ip addr flush dev ${REALDEVICE} 2>/dev/null
-else
-	ip addr flush dev ${REALDEVICE} label ${DEVICE} 2>/dev/null
-fi
-
-if [ "${REALDEVICE}" = "${DEVICE}" ]; then
-  ip link set dev ${DEVICE} down
-fi
-[ "$retcode" = "0" ] && retcode=$?
-
-# wait up to 5 seconds for device to actually come down...
-waited=0
-while ! check_device_down ${DEVICE} && [ "$waited" -lt 50 ] ; do
-    usleep 10000
-    waited=$(($waited+1))
-done
-
-# don't leave an outdated key sitting around
-if [ -n "${WIRELESS_ENC_KEY}" -a -x /sbin/iwconfig ]; then
-    /sbin/iwconfig ${DEVICE} enc 0 >/dev/null 2>&1
-fi
-
-if [ "$retcode" = 0 ] ; then
-    /etc/sysconfig/network-scripts/ifdown-post $CONFIG
-    # do NOT use $? because ifdown should return whether or not
-    # the interface went down.
-fi
-
-if [ "$TYPE" = "Bridge" -a -x /usr/sbin/brctl ]; then
-    /usr/sbin/brctl delbr ${DEVICE}
-fi
-
-if [ -n "$VLAN" -a -x /sbin/vconfig ]; then
-    # 802.1q VLAN
-    if echo ${DEVICE} | LANG=C egrep -v '(:)' | LANG=C egrep -q '(eth|bond)[0-9][0-9]*\.[0-9][0-9]?[0-9]?[0-9]?' ; then
-	[ -f /proc/net/vlan/${DEVICE} ] && {
-	    /sbin/vconfig rem ${DEVICE}
-	}
-    fi
-fi
-
-exit $retcode
+exec ${OTHERSCRIPT} ${CONFIG} $2