From 08e967ee301b502b2114e3855210a0b2600d095c Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 19 Nov 2013 15:25:43 +1100 Subject: discover: Use pxeconffile for udhcpc option name The patch that went upstream for udhcpc's option 209 handling uses the option name 'pxeconffile' rather than 'conffile', and it was added as a non-default option: http://git.busybox.net/busybox/commit/?id=d3092c99ae90f This change uses the new name, and explicilty requests this option. Signed-off-by: Jeremy Kerr --- discover/network.c | 1 + discover/user-event.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'discover') diff --git a/discover/network.c b/discover/network.c index 0490be9..6a1575f 100644 --- a/discover/network.c +++ b/discover/network.c @@ -219,6 +219,7 @@ static void configure_interface_dhcp(struct interface *interface) pb_system_apps.udhcpc, "-R", "-n", + "-O", "pxeconffile", "-p", pidfile, "-i", interface->name, NULL, diff --git a/discover/user-event.c b/discover/user-event.c index 61008c1..d7e0d19 100644 --- a/discover/user-event.c +++ b/discover/user-event.c @@ -237,7 +237,7 @@ struct pb_url *user_event_parse_conf_url(struct discover_context *ctx, char *p, *basedir, *url_str; struct pb_url *url; - conffile = event_get_param(event, "conffile"); + conffile = event_get_param(event, "pxeconffile"); if (conffile) { if (is_url(conffile)) { url = pb_url_parse(ctx, conffile); -- cgit v1.2.1