fix ifup (no longer use the to-be-reverted state of the previous config)

[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 1f200fb..883f8ec 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" ] && {
+       [ -e "/tmp/resolv.conf.auto" ] && rm /tmp/resolv.conf.auto
        config_cb() {
                [ interface != "$1" -o -z "$2" ] || eval "$0 $2"
        }
@@ -11,9 +12,6 @@
        exit
 }
 
-# remove the interface's network state
-uci_revert_state network "$1"
-
 include /lib/network
 scan_interfaces
 
@@ -64,3 +62,11 @@ done
 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