From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 29 Jan 2011 13:45:16 +0000 (+0000)
Subject: base-files: fix handling of dhcp "reqopts" option
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a8edd9d50e47c438e6e56c993030aab0ef1aeeea;p=openwrt%2Fstaging%2Frmilecki.git

base-files: fix handling of dhcp "reqopts" option

SVN-Revision: 25237
---

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 449d252abdc..b59b1f23265 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"