diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-11-19 15:25:43 +1100 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-11-22 10:45:54 +0800 |
| commit | 08e967ee301b502b2114e3855210a0b2600d095c (patch) | |
| tree | 2ce173386c3612e3e9ac61d585556f2b4bb6c250 /test | |
| parent | fc95dc4ecc55c3dd4e429c6b5530ae2672d7ca1f (diff) | |
| download | talos-petitboot-08e967ee301b502b2114e3855210a0b2600d095c.tar.gz talos-petitboot-08e967ee301b502b2114e3855210a0b2600d095c.zip | |
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 <jk@ozlabs.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/parser/test-pxe-empty.c | 2 | ||||
| -rw-r--r-- | test/parser/test-pxe-initrd-in-append.c | 2 | ||||
| -rw-r--r-- | test/parser/test-pxe-non-url-conf.c | 2 | ||||
| -rw-r--r-- | test/parser/test-pxe-single.c | 2 |
4 files changed, 4 insertions, 4 deletions
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"); |
