X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/21479fd2fd326f1096f4f4d32f1e7eb56bcafdfb..02e3b0f5531da86339e8da86b1f78a9b6aba7f50:/package/base-files/files/sbin/ifdown?ds=inline diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown index 8c36a25b4..1455a9de7 100755 --- a/package/base-files/files/sbin/ifdown +++ b/package/base-files/files/sbin/ifdown @@ -1,15 +1,21 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org . /etc/functions.sh [ $# = 0 ] && { echo " $0 "; exit; } -[ "x$1" = "x-a" ] && { - config_cb() { - [ interface != "$1" -o -z "$2" ] || eval "$0 $2" - } - config_load network - exit -} + +case "$1" in + "-a") + [ -e "/tmp/resolv.conf.auto" ] && rm /tmp/resolv.conf.auto + config_cb() { + [ interface != "$1" -o -z "$2" ] || eval "$0 -w $2" + } + config_load network + exit 0 + ;; + "-w") shift ;; +esac + include /lib/network scan_interfaces @@ -20,35 +26,13 @@ config_get proto "$cfg" proto [ -z "$proto" ] && { echo "interface not found."; exit; } config_get iface "$cfg" device -[ "$proto" = "static" ] && { - env -i ACTION="ifdown" INTERFACE="$config" 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 @@ -58,5 +42,16 @@ for dev in $ifname $device; do done config_get iftype "$cfg" type -[ "$iftype" = "bridge" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null +[ "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