diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2013-07-31 08:44:11 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2013-07-31 08:46:54 +0800 |
commit | 404c07fc44449be7b011d1961280ef9c96e0760d (patch) | |
tree | 44895f619b461a31d4251af5e68a4da887ff9450 /test/parser/test-yaboot-root-global.c | |
parent | 37d865eb008f746a0b013557312c6b44c7236eb7 (diff) | |
download | talos-petitboot-404c07fc44449be7b011d1961280ef9c96e0760d.tar.gz talos-petitboot-404c07fc44449be7b011d1961280ef9c96e0760d.zip |
parser/yaboot: Fix check for image presence
In the cleanup of yaboot option state, 3fb8fb6fb, we change from
checking opt->boot_image to opt, to indicate that we're parsing an image
section.
We missed one check, which is causing a segfault due to the null opt.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test/parser/test-yaboot-root-global.c')
-rw-r--r-- | test/parser/test-yaboot-root-global.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/test/parser/test-yaboot-root-global.c b/test/parser/test-yaboot-root-global.c new file mode 100644 index 0000000..6d8da85 --- /dev/null +++ b/test/parser/test-yaboot-root-global.c @@ -0,0 +1,31 @@ + + +#include "parser-test.h" + +#if 0 /* PARSER_EMBEDDED_CONFIG */ +default=linux +root=/dev/sda1 + +image=/vmlinux + label=linux + initrd=/initrd +#endif + +void run_test(struct parser_test *test) +{ + struct discover_boot_option *opt; + struct discover_context *ctx; + + test_read_conf_embedded(test); + test_run_parser(test, "yaboot"); + + ctx = test->ctx; + + check_boot_option_count(ctx, 1); + + opt = get_boot_option(ctx, 0); + + check_name(opt, "linux"); + check_resolved_local_resource(opt->boot_image, ctx->device, "/vmlinux"); + check_resolved_local_resource(opt->initrd, ctx->device, "/initrd"); +} |