summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-05-08 13:02:07 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2017-05-08 13:02:07 (GMT)
commit741bfa9a7219e5d1a5540eddeb0953788549e1da (patch)
treee320321da8a915f5ddfd187862c071548d6092e8
parentc5d16e92c16cdd5ee57101e1ce88b5855e8ece6c (diff)
downloadbusybox-741bfa9a7219e5d1a5540eddeb0953788549e1da.zip
busybox-741bfa9a7219e5d1a5540eddeb0953788549e1da.tar.gz
busybox-741bfa9a7219e5d1a5540eddeb0953788549e1da.tar.bz2
udhcpc: fix "udhcpc -x hostname:<name> not working on nommu"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/udhcp/d6_dhcpc.c2
-rw-r--r--networking/udhcp/dhcpc.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 3e08798..9eddbe2 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -1072,6 +1072,8 @@ int udhcpc6_main(int argc UNUSED_PARAM, char **argv)
/* now it looks similar to udhcpd's config file line:
* "optname optval", using the common routine: */
udhcp_str2optset(optstr, &client_config.options);
+ if (colon)
+ *colon = ':'; /* restore it for NOMMU reexec */
}
if (d6_read_interface(client_config.interface,
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index c45a0af..1ccfff4 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1365,6 +1365,8 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
/* now it looks similar to udhcpd's config file line:
* "optname optval", using the common routine: */
udhcp_str2optset(optstr, &client_config.options);
+ if (colon)
+ *colon = ':'; /* restore it for NOMMU reexec */
}
if (udhcp_read_interface(client_config.interface,