rewrite of the network scripts and configuration

[openwrt.git] / package / base-files / default / sbin / ifdown

diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index 950ee12..7debb95 100755 (executable)
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -1,11 +1,34 @@
-#!/bin/ash
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+

 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

-. /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
-type=$1
+include network
+scan_interfaces
+

 debug "### ifdown $type ###"
 debug "### ifdown $type ###"

-if=$(nvram get ${type}_ifname)
-if_valid $if || exit 
-$DEBUG ifconfig $if down
-kill $(cat /var/run/${if}.pid 2>&-) 2>&-
+type=$1
+
+config_get proto "$type" proto
+[ -z "$proto" ] && { echo "interface not found."; exit; }
+
+# kill active ppp daemon
+pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)"
+[ -n "$pid" -a -d "/proc/$pid" ] && {
+       kill $pid
+       sleep 1
+       [ -d "/proc/$pid" ] && kill -9 $pid
+}
+
+# kill any other process associated with the interface
+config_get ifname "$type" ifname
+pid="$(cat /var/run/${ifname}.pid 2>/dev/null)"
+[ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid
+
+config_get ifname "$type" ifname
+ifconfig "$ifname" >/dev/null 2>/dev/null && {
+       ifconfig "$ifname" 0.0.0.0 down
+
+       config_get iftype "$type" type
+       [ "$iftype" = "bridge" ] && brctl delbr "$ifname"
+}