diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-29 13:45:16 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-01-29 13:45:16 +0000 |
| commit | a8edd9d50e47c438e6e56c993030aab0ef1aeeea (patch) | |
| tree | 0a5f35254664475d6410518d00a06804396deb07 /package/base-files/files/lib | |
| parent | 001b9359deb1ca9d256d4488ed0d80e2f0fd3d1d (diff) | |
| download | upstream-a8edd9d50e47c438e6e56c993030aab0ef1aeeea.tar.gz upstream-a8edd9d50e47c438e6e56c993030aab0ef1aeeea.tar.bz2 upstream-a8edd9d50e47c438e6e56c993030aab0ef1aeeea.zip | |
base-files: fix handling of dhcp "reqopts" option
SVN-Revision: 25237
Diffstat (limited to 'package/base-files/files/lib')
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 449d252abd..b59b1f2326 100755 --- 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"} + # 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" \ @@ -371,8 +376,7 @@ setup_interface() { ${clientid:+-c $clientid} \ ${vendorid:+-V $vendorid} \ -b -p "$pidfile" $broadcast \ - ${reqopts:+-O $reqopts} \ - ${dhcpopts:- -O rootpath -R &} + ${dhcpopts} ;; none) setup_interface_none "$iface" "$config" |