diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2013-08-07 14:00:16 +0800 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2013-08-07 14:30:06 +0800 |
| commit | cdaae762f23d137eef7de73f2226f55090ddbec0 (patch) | |
| tree | 877449205547d353f0080d9c890baab7af0dbb6d /test/parser/test-yaboot-rh8-ppc64.c | |
| parent | 38d7d1a97d46aacf67675038c927e579bb589310 (diff) | |
| download | talos-petitboot-cdaae762f23d137eef7de73f2226f55090ddbec0.tar.gz talos-petitboot-cdaae762f23d137eef7de73f2226f55090ddbec0.zip | |
discover/yaboot: fix device parsing
A couple of fixes for yaboot's device-handling code. Firstly, we need to
use 'device=' rather than 'root=', as the latter is purely for ybin, to
define where the yaboot binary goes.
Secondly, we need to respect global and option-specific device=
parameters. To do this, we keep all boot_image and initrd strings in the
state, and create the actual resources in yaboot_finish.
Add a test for all override cases, and fix the incorrect boot= parsing
in the rh8 test.
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'test/parser/test-yaboot-rh8-ppc64.c')
| -rw-r--r-- | test/parser/test-yaboot-rh8-ppc64.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/test/parser/test-yaboot-rh8-ppc64.c b/test/parser/test-yaboot-rh8-ppc64.c index 97d0162..8966cfd 100644 --- a/test/parser/test-yaboot-rh8-ppc64.c +++ b/test/parser/test-yaboot-rh8-ppc64.c @@ -5,7 +5,6 @@ void run_test(struct parser_test *test) { struct discover_boot_option *opt; struct discover_context *ctx; - struct discover_device *dev; test_read_conf_file(test, "yaboot-rh8-ppc64.conf"); test_run_parser(test, "yaboot"); @@ -16,15 +15,9 @@ void run_test(struct parser_test *test) opt = get_boot_option(ctx, 0); - check_unresolved_resource(opt->boot_image); - check_unresolved_resource(opt->initrd); - - dev = test_create_device(ctx, "sdb1"); - test_hotplug_device(test, dev); - - check_resolved_local_resource(opt->boot_image, dev, + check_resolved_local_resource(opt->boot_image, test->ctx->device, "/boot/vmlinuz-1.0-20121219-1"); - check_resolved_local_resource(opt->initrd, dev, + check_resolved_local_resource(opt->initrd, test->ctx->device, "/boot/initrd-1.0-20121219-1.img"); check_args(opt, "root=/dev/sdb2 root=/dev/sdb2 ro crashkernel=auto " |
