base-files: add a few default groups to /etc/group so that we can get rid of a few...

[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 d285da2..def1562 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"
 
 
 # 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
 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 ] && {
                        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
                                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
                                        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
                                } || {
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {


@@ -190,6 +188,7 @@ prepare_interface() {
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
                                        $DEBUG ifconfig "$iface" 0.0.0.0
                                        $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
                                        # Creating the bridge here will have triggered a hotplug event, which will
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
                                        # Creating the bridge here will have triggered a hotplug event, which will


@@ -228,16 +227,17 @@ setup_interface_static() {
        config_get ip6addr "$config" ip6addr
        [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
 
        config_get ip6addr "$config" ip6addr
        [ -z "$ipaddr" -o -z "$netmask" ] && [ -z "$ip6addr" ] && return 1
 

-       local gateway ip6gw dns bcast
+       local gateway ip6gw dns bcast metric

        config_get gateway "$config" gateway
        config_get ip6gw "$config" ip6gw
        config_get dns "$config" dns
        config_get bcast "$config" broadcast
        config_get gateway "$config" gateway
        config_get ip6gw "$config" ip6gw
        config_get dns "$config" dns
        config_get bcast "$config" broadcast

+       config_get metric "$config" metric

 
        [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
        [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
 
        [ -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" dev "$iface"
-       [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" dev "$iface"
+       [ -z "$gateway" ] || $DEBUG route add default gw "$gateway" ${metric:+metric $metric} dev "$iface"
+       [ -z "$ip6gw" ] || $DEBUG route -A inet6 add default gw "$ip6gw" ${metric:+metric $metric} dev "$iface"

        [ -z "$dns" ] || add_dns "$config" $dns
 
        config_get type "$config" TYPE
        [ -z "$dns" ] || add_dns "$config" $dns
 
        config_get type "$config" TYPE


@@ -344,7 +344,7 @@ setup_interface() {
                        local pidfile="/var/run/dhcp-${iface}.pid"
                        service_kill udhcpc "$pidfile"
 
                        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
                        config_get ipaddr "$config" ipaddr
                        config_get netmask "$config" netmask
                        config_get hostname "$config" hostname


@@ -352,13 +352,19 @@ setup_interface() {
                        config_get clientid "$config" clientid
                        config_get vendorid "$config" vendorid
                        config_get_bool broadcast "$config" broadcast 0
                        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"}
 
 
                        [ -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)
                        # 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" \
                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
 
                        $DEBUG eval udhcpc -t 0 -i "$iface" \


@@ -367,7 +373,7 @@ setup_interface() {
                                ${clientid:+-c $clientid} \
                                ${vendorid:+-V $vendorid} \
                                -b -p "$pidfile" $broadcast \
                                ${clientid:+-c $clientid} \
                                ${vendorid:+-V $vendorid} \
                                -b -p "$pidfile" $broadcast \

-                               ${dhcpopts:- -O rootpath -R &}
+                               ${dhcpopts}

                ;;
                none)
                        setup_interface_none "$iface" "$config"
                ;;
                none)
                        setup_interface_none "$iface" "$config"


@@ -410,6 +416,7 @@ unbridge() {
 
                for brdev in $(brctl show | awk '$2 ~ /^[0-9].*\./ { print $1 }'); do
                        brctl delif "$brdev" "$dev" 2>/dev/null >/dev/null
 
                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
        }
 }
                done
        }
 }