[git commit] udhcpc: fix "udhcpc -x hostname:<name> not working on nommu"

Denys Vlasenko vda.linux at googlemail.com
Mon May 8 13:02:07 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=741bfa9a7219e5d1a5540eddeb0953788549e1da
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/udhcp/d6_dhcpc.c | 2 ++
 networking/udhcp/dhcpc.c    | 2 ++
 2 files changed, 4 insertions(+)

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,


More information about the busybox-cvs mailing list