[ar7] let 802.1q tagged frames go in and out from cpmac (#6730)

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

diff --git a/package/base-files/files/sbin/ifdown b/package/base-files/files/sbin/ifdown
index f8ce81b..8de414d 100755 (executable)
--- a/package/base-files/files/sbin/ifdown
+++ b/package/base-files/files/sbin/ifdown
@@ -4,6 +4,7 @@
 . /etc/functions.sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 [ "x$1" = "x-a" ] && {
 . /etc/functions.sh
 [ $# = 0 ] && { echo "  $0 <group>"; 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"
        }
        config_cb() {
                [ interface != "$1" -o -z "$2" ] || eval "$0 $2"
        }


@@ -11,11 +12,6 @@
        exit
 }
 
        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
 
 include /lib/network
 scan_interfaces
 


@@ -26,8 +22,8 @@ config_get proto "$cfg" proto
 [ -z "$proto" ] && { echo "interface not found."; exit; }
 
 config_get iface "$cfg" device
 [ -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
 }
 
 # call interface stop handler


@@ -66,3 +62,11 @@ done
 config_get iftype "$cfg" type
 [ "bridge" = "$iftype" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null
 
 config_get iftype "$cfg" type
 [ "bridge" = "$iftype" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null
 

+# 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