diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-05 19:28:24 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-11-05 19:28:24 +0000 |
| commit | 611b2e8bb38a4d9b4a85e8766d38c4eb1b93df25 (patch) | |
| tree | e362be1b03c16436f14ad348e6b4467dd93ed3dc /package/network | |
| parent | e92da5e7ae42c7fa6b2308311bf963141226f7e8 (diff) | |
| download | upstream-611b2e8bb38a4d9b4a85e8766d38c4eb1b93df25.tar.gz upstream-611b2e8bb38a4d9b4a85e8766d38c4eb1b93df25.tar.bz2 upstream-611b2e8bb38a4d9b4a85e8766d38c4eb1b93df25.zip | |
netifd: don't send a default client identifier in DHCP requests if no clientid uci option is given (#12426)
SVN-Revision: 34089
Diffstat (limited to 'package/network')
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh index 7b1fe37806..38308785df 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -27,6 +27,7 @@ proto_dhcp_setup() { done [ "$broadcast" = 1 ] && broadcast="-B" || 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() { |