[package] libpcap: explicitely disable libnl support to prevent different build resul...

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

diff --git a/package/base-files-network/files/lib/network/config.sh b/package/base-files-network/files/lib/network/config.sh
index 74810e4..5e8b059 100755 (executable)
--- a/package/base-files-network/files/lib/network/config.sh
+++ b/package/base-files-network/files/lib/network/config.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 #!/bin/sh

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 
 # DEBUG="echo"
 
 
 # DEBUG="echo"
 

+. /lib/functions/service.sh
+

 do_sysctl() {
        [ -n "$2" ] && \
                sysctl -n -e -w "$1=$2" >/dev/null || \
 do_sysctl() {
        [ -n "$2" ] && \
                sysctl -n -e -w "$1=$2" >/dev/null || \


@@ -83,6 +85,7 @@ add_vlan() {
 
        [ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || {
                ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif"
 
        [ "$1" = "$vif" ] || ifconfig "$1" >/dev/null 2>/dev/null || {
                ifconfig "$vif" up 2>/dev/null >/dev/null || add_vlan "$vif"

+               $DEBUG vconfig set_name_type DEV_PLUS_VID_NO_PAD

                $DEBUG vconfig add "$vif" "${1##*\.}"
                return 0
        }
                $DEBUG vconfig add "$vif" "${1##*\.}"
                return 0
        }


@@ -218,7 +221,8 @@ prepare_interface() {
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
                                        [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
                                        [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"

-                                       echo $igmp_snooping > /sys/devices/virtual/net/br-$config/bridge/multicast_snooping 2>/dev/null
+                                       [ -e /sys/devices/virtual/net/br-$config/bridge/multicast_snooping ] && \
+                                               echo $igmp_snooping > /sys/devices/virtual/net/br-$config/bridge/multicast_snooping

                                        $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
                                        $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


@@ -368,7 +372,9 @@ setup_interface() {
                dhcp)
                        # kill running udhcpc instance
                        local pidfile="/var/run/dhcp-${iface}.pid"
                dhcp)
                        # kill running udhcpc instance
                        local pidfile="/var/run/dhcp-${iface}.pid"

-                       service_kill udhcpc "$pidfile"
+
+                       SERVICE_PID_FILE="$pidfile" \
+                       service_stop /sbin/udhcpc

 
                        local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts
                        config_get ipaddr "$config" ipaddr
 
                        local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts
                        config_get ipaddr "$config" ipaddr


@@ -384,16 +390,23 @@ setup_interface() {
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
                        # additional request options
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
                        # additional request options

-                       local opt dhcpopts
+                       local opt dhcpopts daemonize

                        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)
                        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)

-                       [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &"
+                       [ "$proto1" != "$proto" ] && {
+                               append dhcpopts "-n -q"
+                       } || {
+                               append dhcpopts "-O rootpath -R"
+                               daemonize=1
+                       }

                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
 
                        [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
 

-                       $DEBUG eval udhcpc -t 0 -i "$iface" \
+                       SERVICE_DAEMONIZE=$daemonize \
+                       SERVICE_PID_FILE="$pidfile" \
+                       service_start /sbin/udhcpc -t 0 -i "$iface" \

                                ${ipaddr:+-r $ipaddr} \
                                ${hostname:+-H $hostname} \
                                ${clientid:+-c $clientid} \
                                ${ipaddr:+-r $ipaddr} \
                                ${hostname:+-H $hostname} \
                                ${clientid:+-c $clientid} \


@@ -426,8 +439,8 @@ stop_interface_dhcp() {
 
        remove_dns "$config"
 
 
        remove_dns "$config"
 

-       local pidfile="/var/run/dhcp-${ifname}.pid"
-       service_kill udhcpc "$pidfile"
+       SERVICE_PID_FILE="/var/run/dhcp-${ifname}.pid" \
+       service_stop /sbin/udhcpc

 
        uci -P /var/state revert "network.$config"
 }
 
        uci -P /var/state revert "network.$config"
 }