[package] base-files:

[openwrt/svn-archive/archive.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 1a77145f5a132853a1b13e62972861c99975cce0..1bb3a46ecd133f428138051d39854a264d287c2c 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -70,6 +70,16 @@ add_vlan() {
 add_dns() {
        local cfg="$1"; shift
 
+       remove_dns "$cfg"
+
+       # We may be called by pppd's ip-up which has a nonstandard umask set.
+       # Create an empty file here and force its permission to 0644, otherwise
+       # dnsmasq will not be able to re-read the resolv.conf.auto .
+       [ ! -f /tmp/resolv.conf.auto ] && {
+               touch /tmp/resolv.conf.auto
+               chmod 0644 /tmp/resolv.conf.auto
+       }
+
        local dns
        local add
        for dns in "$@"; do
@@ -79,20 +89,27 @@ add_dns() {
                }
        done
 
-       uci_set_state network "$cfg" dns "$add"
+       [ -n "$cfg" ] && {
+               uci_set_state network "$cfg" dns "$add"
+               uci_set_state network "$cfg" resolv_dns "$add"
+       }
 }
 
 # remove dns entries of the given iface
 remove_dns() {
        local cfg="$1"
 
-       local dns
-       config_get dns "$cfg" dns
-       for dns in $dns; do
-               sed -i -e "/^nameserver $dns$/d" /tmp/resolv.conf.auto
-       done
+       [ -n "$cfg" ] && {
+               [ -f /tmp/resolv.conf.auto ] && {
+                       local dns=$(uci_get_state network "$cfg" resolv_dns)
+                       for dns in $dns; do
+                               sed -i -e "/^nameserver $dns$/d" /tmp/resolv.conf.auto
+                       done
+               }
 
-       uci_revert_state network "$cfg" dns
+               uci_revert_state network "$cfg" dns
+               uci_revert_state network "$cfg" resolv_dns
+       }
 }
 
 # sort the device list, drop duplicates
@@ -144,6 +161,8 @@ prepare_interface() {
        config_get iftype "$config" type
        case "$iftype" in
                bridge)
+                       local macaddr
+                       config_get macaddr "$config" macaddr
                        [ -x /usr/sbin/brctl ] && {
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
@@ -168,7 +187,7 @@ prepare_interface() {
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.
                                }
-                               ifconfig "$iface" up 2>/dev/null >/dev/null
+                               ifconfig "$iface" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null
                                return 1
                        }
                ;;
@@ -210,13 +229,7 @@ setup_interface_static() {
        [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
        [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" dev "$iface"
        [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" dev "$iface"
-       [ -z "$dns" ] || {
-               for ns in $dns; do
-                       grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || {
-                               echo "nameserver $ns" >> /tmp/resolv.conf.auto
-                       }
-               done
-       }
+       [ -z "$dns" ] || add_dns "$config" $dns
 
        config_get type "$config" TYPE
        [ "$type" = "alias" ] && return 0
@@ -361,12 +374,14 @@ setup_interface() {
 stop_interface_dhcp() {
        local config="$1"
 
-       local iface
+       local ifname
        config_get ifname "$config" ifname
 
        local lock="/var/lock/dhcp-${ifname}"
        [ -f "$lock" ] && lock -u "$lock"
 
+       remove_dns "$config"
+
        local pidfile="/var/run/dhcp-${ifname}.pid"
        local pid="$(cat "$pidfile" 2>/dev/null)"
        [ -d "/proc/$pid" ] && {