aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-05 19:47:15 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-11-05 19:47:15 +0000
commita925a2ef5988f94df12517257e41fc44d3dae997 (patch)
tree02de6aeb6dcef61e73cc6b5d3bec3f2756870f5b
parent54df7d2b3497e8435a5078d16011eec7f531cdcb (diff)
downloadopenwrt-a925a2ef5988f94df12517257e41fc44d3dae997.tar.gz
openwrt-a925a2ef5988f94df12517257e41fc44d3dae997.zip
AA: netifd: backport r34089
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34090 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/netifd/files/lib/netifd/proto/dhcp.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/netifd/files/lib/netifd/proto/dhcp.sh b/package/netifd/files/lib/netifd/proto/dhcp.sh
index 9182d58ad..7dea1cf6c 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() {