update wrt54g3g pattern version, add wrt54g3g-em pattern (#2663)
[openwrt.git] / package / base-files / files / lib / network / config.sh
index 3ff65ff..f07d926 100755 (executable)
@@ -88,6 +88,7 @@ prepare_interface() {
 
        # Setup bridging
        config_get iftype "$config" type
+       config_get stp "$config" stp
        case "$iftype" in
                bridge)
                        [ -x /usr/sbin/brctl ] && {
@@ -99,6 +100,7 @@ prepare_interface() {
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
                                        $DEBUG brctl addif "br-$config" "$iface"
+                                       $DEBUG brctl stp "br-$config" ${stp:-off}
                                        # 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.
@@ -177,13 +179,14 @@ setup_interface() {
                        config_get netmask "$config" netmask
                        config_get hostname "$config" hostname
                        config_get proto1 "$config" proto
+                       config_get clientid "$config" clientid
 
                        [ -z "$ipaddr" ] || \
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
                        [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
-                       $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
+                       $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -R &}
                        lock -u "/var/lock/dhcp-$iface"
                ;;
                *)
This page took 0.026276 seconds and 4 git commands to generate.