From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 5 Nov 2012 19:47:15 +0000 (+0000)
Subject: AA: netifd: backport r34089
X-Git-Tag: attitude_adjustment_12.09~153
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e7ff95b3c105d20838f96bf3701dd72ff4befb2f;p=openwrt%2Fsvn-archive%2Fopenwrt.git

AA: netifd: backport r34089

SVN-Revision: 34090
---

diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh
index 9182d58ad8..7dea1cf6c2 100755
--- a/package/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/netifd/files/lib/netifd/proto/dhcp.sh
@@ -27,6 +27,7 @@ proto_dhcp_setup() {
 	done
 
 	[ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
+	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
 
 	proto_export "INTERFACE=$config"
 	proto_run_command "$config" udhcpc \
@@ -35,9 +36,8 @@ proto_dhcp_setup() {
 		-f -t 0 -i "$iface" \
 		${ipaddr:+-r $ipaddr} \
 		${hostname:+-H $hostname} \
-		${clientid:+-x 0x3d:${clientid//:/}} \
 		${vendorid:+-V $vendorid} \
-		$broadcast $dhcpopts
+		$clientid $broadcast $dhcpopts
 }
 
 proto_dhcp_teardown() {