KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netifd: Use -x hostname:$hostname instead of -H

Browse source 
Passing the hostname is currently broken in since the shipped busybox includes this commit:
https://git.busybox.net/busybox/commit/networking/udhcp/dhcpc.c?id=2017d48c0d70bef8768efb42909e605ea8eb5a21

Before:

    Sun Jan 31 18:11:32 2016 daemon.notice netifd: Interface 'wan' is now down
    Sun Jan 31 18:11:32 2016 daemon.notice netifd: Interface 'wan' is setting up now
    Sun Jan 31 18:11:32 2016 daemon.notice netifd: wan (18158): udhcpc: option -h NAME is deprecated, use -x hostname:NAME
    Sun Jan 31 18:11:32 2016 daemon.notice netifd: wan (18158): udhcpc: malformed hex string 'WR150'

After:

    Sun Jan 31 18:11:33 2016 daemon.notice netifd: wan (18169): udhcpc (v1.23.2) started
    Sun Jan 31 18:11:33 2016 daemon.notice netifd: wan (18169): Sending discover...
    Sun Jan 31 18:11:33 2016 daemon.notice netifd: wan (18169): Sending select for xxx.yyy.zzz.xyz...
    Sun Jan 31 18:11:33 2016 daemon.notice netifd: wan (18169): Lease of xxx.yyy.zzz.xyz obtained, lease time 600

Signed-off-by: Merlijn Wajer <merlijn@wizzup.org>
This commit is contained in:
Merlijn Wajer 2016-07-20 17:23:52 +02:00 committed by John Crispin
parent e1406cd31a
commit 4a0c4d8151
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
View file

@ -56,7 +56,7 @@ proto_dhcp_setup() {
-s /lib/netifd/dhcp.script \ -s /lib/netifd/dhcp.script \
-f -t 0 -i "$iface" \ -f -t 0 -i "$iface" \
${ipaddr:+-r $ipaddr} \ ${ipaddr:+-r $ipaddr} \
${hostname:+-H "$hostname"} \ ${hostname:+-x "hostname:$hostname"} \
${vendorid:+-V "$vendorid"} \ ${vendorid:+-V "$vendorid"} \
$clientid $broadcast $release $dhcpopts $clientid $broadcast $release $dhcpopts
} }