diff options
author | Natanael Copa <natanael.copa@gmail.com> | 2012-09-19 16:55:08 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-31 14:19:06 +0100 |
commit | 1062391365981a09069f96509937b7f1181b7484 (patch) | |
tree | 031732d8fb9e69300cb2ae0c5b3e85285ce72989 | |
parent | 6bd3fff51aa74e2ee2d87887b12182a3b09792ef (diff) | |
download | busybox-w32-1062391365981a09069f96509937b7f1181b7484.tar.gz busybox-w32-1062391365981a09069f96509937b7f1181b7484.tar.bz2 busybox-w32-1062391365981a09069f96509937b7f1181b7484.zip |
ifupdown: use -x hostname:NAME with udhcpc
The -H NAME is deprecated in udhcpc. See commit
2017d48c0d70bef8768efb42909e605ea8eb5a21
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/ifupdown.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index d477ff6d1..766dfabbd 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -535,7 +535,7 @@ static const struct dhcp_client_t ext_dhcp_clients[] = { | |||
535 | "pump -i %iface% -k", | 535 | "pump -i %iface% -k", |
536 | }, | 536 | }, |
537 | { "udhcpc", | 537 | { "udhcpc", |
538 | "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -H %hostname%]][[ -c %client%]]" | 538 | "udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid -i %iface%[[ -x hostname:%hostname%]][[ -c %client%]]" |
539 | "[[ -s %script%]][[ %udhcpc_opts%]]", | 539 | "[[ -s %script%]][[ %udhcpc_opts%]]", |
540 | "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", | 540 | "kill `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", |
541 | }, | 541 | }, |
@@ -575,7 +575,7 @@ static int FAST_FUNC dhcp_up(struct interface_defn_t *ifd, execfn *exec) | |||
575 | return 0; | 575 | return 0; |
576 | # endif | 576 | # endif |
577 | return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " | 577 | return execute("udhcpc " UDHCPC_CMD_OPTIONS " -p /var/run/udhcpc.%iface%.pid " |
578 | "-i %iface%[[ -H %hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", | 578 | "-i %iface%[[ -x hostname:%hostname%]][[ -c %client%]][[ -s %script%]][[ %udhcpc_opts%]]", |
579 | ifd, exec); | 579 | ifd, exec); |
580 | } | 580 | } |
581 | # else | 581 | # else |