[package] base-files: fix handling of dhcp "reqopts" option

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25237 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 449d252..b59b1f2 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -360,9 +360,14 @@ setup_interface() {
                        [ -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" \


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

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

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