large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

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

diff --git a/openwrt/package/base-files/default/sbin/ifdown b/openwrt/package/base-files/default/sbin/ifdown
index 85bb2fb..0d85ca8 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/ifdown
+++ b/openwrt/package/base-files/default/sbin/ifdown
@@ -1,26 +1,18 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

-. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
+. /etc/config/network

 
 debug "### ifdown $type ###"
 type=$1
 
 
 debug "### ifdown $type ###"
 type=$1
 

-if_proto=$(nvram get ${type}_proto)
-if=$(nvram get ${type}_ifname)
+eval "if_proto=\"\${${type}_proto}\""
+eval "if=\"\${${type}_ifname}\""
+[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\""

 
 case "$if_proto" in
        pppoa) hotplug_dev unregister atm0; exit 0 ;;
        ""|none) exit 0;;
 esac
 
 
 case "$if_proto" in
        pppoa) hotplug_dev unregister atm0; exit 0 ;;
        ""|none) exit 0;;
 esac
 

-[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)"
-
-if [ "${if%%[0-9]}" = "br" ]; then
-       for sif in $(nvram get ${type}_ifnames); do
-               hotplug_dev unregister "$sif"
-       done
-fi
-       

 hotplug_dev unregister "$if"
 hotplug_dev unregister "$if"