X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/46da1409881bee5a1b11691d286f773f38374bd9..271da7f4e93492f377c0fcf25def4591d60b9fbc:/package/base-files/files/sbin/ifdown diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown index f8ce81bcb..92cdfd2b0 100755 --- a/package/base-files/files/sbin/ifdown +++ b/package/base-files/files/sbin/ifdown @@ -4,6 +4,7 @@ . /etc/functions.sh [ $# = 0 ] && { echo " $0 "; exit; } [ "x$1" = "x-a" ] && { + [ -e "/tmp/resolv.conf.auto" ] && rm /tmp/resolv.conf.auto config_cb() { [ interface != "$1" -o -z "$2" ] || eval "$0 $2" } @@ -11,11 +12,6 @@ exit } -# remove the interface's network state -FILE=/var/state/network.$$ -grep -v "^config_set '$1' " /var/state/network > "$FILE" -mv "$FILE" /var/state/network - include /lib/network scan_interfaces @@ -26,35 +22,13 @@ config_get proto "$cfg" proto [ -z "$proto" ] && { echo "interface not found."; exit; } config_get iface "$cfg" device -[ "static" = "$proto" ] && { - env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" & +[ "static" = "$proto" -o "none" = "$proto" ] && { + env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$iface" PROTO="$proto" /sbin/hotplug-call "iface" } # call interface stop handler ( type "stop_interface_$proto" ) >/dev/null 2>/dev/null && eval "stop_interface_$proto '$cfg'" -# make sure all locks are removed -for lock in "/var/lock/dhcp-$iface" "/var/lock/ppp-$iface"; do - [ -f "$lock" ] && { - lock -u "$lock" - sleep 1 - } -done - -# kill active ppp daemon and other processes -config_get ifname "$cfg" ifname -pids="$(head -n1 -q /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)" -for pid in $pids; do - [ -d "/proc/$pid" ] && { - kill $pid - [ -d "/proc/$pid" ] && { - sleep 1 - kill -9 $pid 2>/dev/null >/dev/null - } - } -done -rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid - config_get ifname "$cfg" ifname config_get device "$cfg" device @@ -66,3 +40,14 @@ done config_get iftype "$cfg" type [ "bridge" = "$iftype" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null +# remove the interface's dns entries +remove_dns "$cfg" + +# remove the interface's network state +uci_revert_state network "$1" + +# revert aliases state as well +config_get aliases "$1" aliases +for config in $aliases; do + uci_revert_state network "$config" +done