[package] uhttpd:

[openwrt.git] / package / base-files / files / lib / network / config.sh

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 6337643..e64198b 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -161,10 +161,6 @@ setup_interface_none() {
        env -i ACTION="ifup" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
 }
 
-stop_interface_none() {
-       env -i ACTION="ifdown" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
-}
-
 setup_interface_static() {
        local iface="$1"
        local config="$2"
@@ -331,12 +327,17 @@ setup_interface() {
        }
 }
 
+stop_interface_dhcp() {
+       local config="$1"
+       uci -P /var/state revert "network.$config"
+}
+
 unbridge() {
        local dev="$1"
        local brdev
 
        [ -x /usr/sbin/brctl ] || return 0
-       brctl show | grep "$dev" >/dev/null && {
+       brctl show 2>/dev/null | grep "$dev" >/dev/null && {
                # interface is still part of a bridge, correct that
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do