tools/firmware-utils: allow to create buffalo tags w/o hw version

[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 358e610..a194ab8 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -3,6 +3,12 @@
 
 # DEBUG="echo"
 
+do_sysctl() {
+       [ -n "$2" ] && \
+               sysctl -n -e -w "$1=$2" >/dev/null || \
+               sysctl -n -e "$1"
+}
+
 find_config() {
        local iftype device iface ifaces ifn
        for ifn in $interfaces; do
@@ -164,15 +170,6 @@ prepare_interface() {
                        local macaddr
                        config_get macaddr "$config" macaddr
                        [ -x /usr/sbin/brctl ] && {
-                               # Remove IPv6 link local addr before adding the iface to the bridge
-                               local llv6="$(ifconfig "$iface")"
-                               case "$llv6" in
-                                       *fe80:*/64*)
-                                               llv6="${llv6#* fe80:}"
-                                               ifconfig "$iface" del "fe80:${llv6%% *}"
-                                       ;;
-                               esac
-
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                                        config_get devices "$config" device
@@ -181,6 +178,7 @@ prepare_interface() {
                                        done
                                        uci_set_state network "$config" device "$newdevs"
                                        $DEBUG ifconfig "$iface" 0.0.0.0
+                                       $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {
@@ -188,10 +186,12 @@ prepare_interface() {
                                        config_get_bool stp "$config" stp 0
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
-                                       $DEBUG ifconfig "br-$config" up
                                        $DEBUG ifconfig "$iface" 0.0.0.0
+                                       $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
+                                       [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"
+                                       $DEBUG ifconfig "br-$config" hw ether $macaddr up
                                        # Creating the bridge here will have triggered a hotplug event, which will
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.
@@ -235,6 +235,11 @@ setup_interface_static() {
        config_get bcast "$config" broadcast
        config_get metric "$config" metric
 
+       case "$ip6addr" in
+               */*) ;;
+               *:*) ip6addr="$ip6addr/64" ;;
+       esac
+
        [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
        [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
        [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface"
@@ -325,7 +330,7 @@ setup_interface() {
        }
 
        # Interface settings
-       grep "$iface:" /proc/net/dev > /dev/null && {
+       grep -qE "^ *$iface:" /proc/net/dev && {
                local mtu macaddr txqueuelen
                config_get mtu "$config" mtu
                config_get macaddr "$config" macaddr
@@ -345,7 +350,7 @@ setup_interface() {
                        local pidfile="/var/run/dhcp-${iface}.pid"
                        service_kill udhcpc "$pidfile"
 
-                       local ipaddr netmask hostname proto1 clientid vendorid broadcast
+                       local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts
                        config_get ipaddr "$config" ipaddr
                        config_get netmask "$config" netmask
                        config_get hostname "$config" hostname
@@ -353,13 +358,19 @@ setup_interface() {
                        config_get clientid "$config" clientid
                        config_get vendorid "$config" vendorid
                        config_get_bool broadcast "$config" broadcast 0
+                       config_get reqopts "$config" reqopts
 
                        [ -z "$ipaddr" ] || \
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
+                       # additional request options
+                       local opt dhcpopts
+                       for opt in $reqopts; do
+                               append dhcpopts "-O $opt"
+                       done
+
                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
-                       local dhcpopts
-                       [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
+                       [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &"
                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
 
                        $DEBUG eval udhcpc -t 0 -i "$iface" \
@@ -368,7 +379,7 @@ setup_interface() {
                                ${clientid:+-c $clientid} \
                                ${vendorid:+-V $vendorid} \
                                -b -p "$pidfile" $broadcast \
-                               ${dhcpopts:- -O rootpath -R &}
+                               ${dhcpopts}
                ;;
                none)
                        setup_interface_none "$iface" "$config"
@@ -411,6 +422,7 @@ unbridge() {
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
                        brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
+                       do_sysctl "net.ipv6.conf.$dev.disable_ipv6" 0
                done
        }
 }