diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-05 19:47:15 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-05 19:47:15 +0000 |
| commit | 9c6555d28b9d5472c60957c4b369bb5015ed7eed (patch) | |
| tree | 02de6aeb6dcef61e73cc6b5d3bec3f2756870f5b /package/netifd/files | |
| parent | 1b522d8b1eded23d588ee172e53b017184cb2d98 (diff) | |
| download | upstream-9c6555d28b9d5472c60957c4b369bb5015ed7eed.tar.gz upstream-9c6555d28b9d5472c60957c4b369bb5015ed7eed.tar.bz2 upstream-9c6555d28b9d5472c60957c4b369bb5015ed7eed.zip | |
AA: netifd: backport r34089
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34090 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/netifd/files')
| -rwxr-xr-x | package/netifd/files/lib/netifd/proto/dhcp.sh | 4 |
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 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() { |