From 08e967ee301b502b2114e3855210a0b2600d095c Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 19 Nov 2013 15:25:43 +1100 Subject: [PATCH] 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 +- test/parser/test-pxe-empty.c | 2 +- test/parser/test-pxe-initrd-in-append.c | 2 +- test/parser/test-pxe-non-url-conf.c | 2 +- test/parser/test-pxe-single.c | 2 +- utils/pb-udhcpc | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) 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); diff --git a/test/parser/test-pxe-empty.c b/test/parser/test-pxe-empty.c index fbc1d8a..df3b233 100644 --- a/test/parser/test-pxe-empty.c +++ b/test/parser/test-pxe-empty.c @@ -12,7 +12,7 @@ void run_test(struct parser_test *test) test_read_conf_embedded(test, "conf.txt"); test_set_event_source(test); - test_set_event_param(test->ctx->event, "conffile", + test_set_event_param(test->ctx->event, "pxeconffile", "tftp://host/dir/conf.txt"); test_run_parser(test, "pxe"); diff --git a/test/parser/test-pxe-initrd-in-append.c b/test/parser/test-pxe-initrd-in-append.c index 6cd2ef4..2939e98 100644 --- a/test/parser/test-pxe-initrd-in-append.c +++ b/test/parser/test-pxe-initrd-in-append.c @@ -17,7 +17,7 @@ void run_test(struct parser_test *test) test_read_conf_embedded(test, "conf.txt"); test_set_event_source(test); - test_set_event_param(test->ctx->event, "conffile", + test_set_event_param(test->ctx->event, "pxeconffile", "tftp://host/dir/conf.txt"); test_run_parser(test, "pxe"); diff --git a/test/parser/test-pxe-non-url-conf.c b/test/parser/test-pxe-non-url-conf.c index e8bb849..08f246a 100644 --- a/test/parser/test-pxe-non-url-conf.c +++ b/test/parser/test-pxe-non-url-conf.c @@ -19,7 +19,7 @@ void run_test(struct parser_test *test) test_set_event_source(test); test_set_event_param(test->ctx->event, "siaddr", "host"); - test_set_event_param(test->ctx->event, "conffile", "conf.txt"); + test_set_event_param(test->ctx->event, "pxeconffile", "conf.txt"); test_run_parser(test, "pxe"); diff --git a/test/parser/test-pxe-single.c b/test/parser/test-pxe-single.c index ccb4d5c..0bc6a59 100644 --- a/test/parser/test-pxe-single.c +++ b/test/parser/test-pxe-single.c @@ -18,7 +18,7 @@ void run_test(struct parser_test *test) test_read_conf_embedded(test, "conf.txt"); test_set_event_source(test); - test_set_event_param(test->ctx->event, "conffile", + test_set_event_param(test->ctx->event, "pxeconffile", "tftp://host/dir/conf.txt"); test_run_parser(test, "pxe"); diff --git a/utils/pb-udhcpc b/utils/pb-udhcpc index 3494985..4ff0dcf 100644 --- a/utils/pb-udhcpc +++ b/utils/pb-udhcpc @@ -18,7 +18,7 @@ pb_add () { paramstr='' # Collect relevant DHCP response parameters into $paramstr - for name in conffile bootfile mac ip siaddr serverid tftp + for name in pxeconffile bootfile mac ip siaddr serverid tftp do value=$(eval "echo \${$name}") [ -n "$value" ] || continue; -- 2.39.2