diff options
| author | Merlijn Wajer <merlijn@wizzup.org> | 2016-07-20 17:23:52 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-07-24 06:59:55 +0200 |
| commit | 4a0c4d81510020fe5c426c2e6adf37d396079b05 (patch) | |
| tree | fd8dfc879df53add684561e422c003a56b3a9bdb | |
| parent | e1406cd31a598b48350e0c012dc177c5b752d05b (diff) | |
| download | upstream-4a0c4d81510020fe5c426c2e6adf37d396079b05.tar.gz upstream-4a0c4d81510020fe5c426c2e6adf37d396079b05.tar.bz2 upstream-4a0c4d81510020fe5c426c2e6adf37d396079b05.zip | |
netifd: Use -x hostname:$hostname instead of -H
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>
| -rwxr-xr-x | package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 2 |
1 files changed, 1 insertions, 1 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 abfdaaffdd..1d3a209106 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -56,7 +56,7 @@ proto_dhcp_setup() { -s /lib/netifd/dhcp.script \ -f -t 0 -i "$iface" \ ${ipaddr:+-r $ipaddr} \ - ${hostname:+-H "$hostname"} \ + ${hostname:+-x "hostname:$hostname"} \ ${vendorid:+-V "$vendorid"} \ $clientid $broadcast $release $dhcpopts } |