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 <jk@ozlabs.org>
pb_system_apps.udhcpc,
"-R",
"-n",
pb_system_apps.udhcpc,
"-R",
"-n",
"-p", pidfile,
"-i", interface->name,
NULL,
"-p", pidfile,
"-i", interface->name,
NULL,
char *p, *basedir, *url_str;
struct pb_url *url;
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);
if (conffile) {
if (is_url(conffile)) {
url = pb_url_parse(ctx, conffile);
test_read_conf_embedded(test, "conf.txt");
test_set_event_source(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");
"tftp://host/dir/conf.txt");
test_run_parser(test, "pxe");
test_read_conf_embedded(test, "conf.txt");
test_set_event_source(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");
"tftp://host/dir/conf.txt");
test_run_parser(test, "pxe");
test_set_event_source(test);
test_set_event_param(test->ctx->event, "siaddr", "host");
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");
test_run_parser(test, "pxe");
test_read_conf_embedded(test, "conf.txt");
test_set_event_source(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");
"tftp://host/dir/conf.txt");
test_run_parser(test, "pxe");
paramstr=''
# Collect relevant DHCP response parameters into $paramstr
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;
do
value=$(eval "echo \${$name}")
[ -n "$value" ] || continue;