diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2014-02-27 13:54:32 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2014-02-27 13:54:32 +0800 |
commit | f94ca3311758854670d25ba4e7853d76c2113402 (patch) | |
tree | 8ea7d571a5c986bb93f11b03f6a8eec8e74cd057 /test/parser/test-pxe-path-resolve-relative.c | |
parent | 922756a3aefd8ba5c5675efd37df9f43938cf432 (diff) | |
download | talos-petitboot-f94ca3311758854670d25ba4e7853d76c2113402.tar.gz talos-petitboot-f94ca3311758854670d25ba4e7853d76c2113402.zip |
discover/pxe: pxe parser should only treat "::" paths as absolute
PXELinux treats all paths as relative, requiring a "::/path" syntax for
truly absolute URLs.
This change implements the same behaviour in petitboot, and updates the
testcases to suit.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test/parser/test-pxe-path-resolve-relative.c')
-rw-r--r-- | test/parser/test-pxe-path-resolve-relative.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/test/parser/test-pxe-path-resolve-relative.c b/test/parser/test-pxe-path-resolve-relative.c new file mode 100644 index 0000000..920c139 --- /dev/null +++ b/test/parser/test-pxe-path-resolve-relative.c @@ -0,0 +1,36 @@ + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +label linux +kernel vmlinux +initrd /initrd +#endif + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + test_read_conf_embedded_url(test, "tftp://host/path/conf.txt"); + + test_set_event_source(test); + test_set_event_param(test->ctx->event, "siaddr", "host"); + test_set_event_param(test->ctx->event, "pxeconffile", "path/conf.txt"); + + test_run_parser(test, "pxe"); + + ctx = test->ctx; + + check_boot_option_count(ctx, 1); + opt = get_boot_option(ctx, 0); + + check_name(opt, "linux"); + + /* even though the initrd is specifed as /initrd, pxelinux treats + * this as relative. */ + check_resolved_url_resource(opt->boot_image, + "tftp://host/path/vmlinux"); + check_resolved_url_resource(opt->initrd, + "tftp://host/path/initrd"); +} |