check_unresolved_resource(opt->boot_image);
check_unresolved_resource(opt->initrd);
check_name(opt, "Kubuntu GNU/Linux");
- check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash $vt_handoff");
+ check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash ");
opt = get_boot_option(ctx, 1);
check_unresolved_resource(opt->boot_image);
check_unresolved_resource(opt->initrd);
check_name(opt, "Kubuntu GNU/Linux, with Linux 3.8.0-19-generic");
- check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash $vt_handoff");
+ check_args(opt, "root=UUID=29beca39-9181-4780-bbb2-ab5d4be59aaf ro quiet splash ");
opt = get_boot_option(ctx, 2);
check_name(opt, "Kubuntu GNU/Linux, with Linux 3.8.0-19-generic (recovery mode)");
opt = get_boot_option(ctx, 3);
check_unresolved_resource(opt->boot_image);
+ check_not_present_resource(opt->initrd);
check_name(opt, "Memory test (memtest86+)");
- check_args(opt, "");
+ check_args(opt, NULL);
opt = get_boot_option(ctx, 4);
check_unresolved_resource(opt->boot_image);
+ check_not_present_resource(opt->initrd);
check_name(opt, "Memory test (memtest86+, serial console 115200)");
check_args(opt, "console=ttyS0,115200n8");
/* hotplug a device with a maching UUID, and check that our
* resources become resolved */
- dev = test_create_device(ctx, "external");
+ dev = test_create_device(test, "external");
dev->uuid = "29beca39-9181-4780-bbb2-ab5d4be59aaf";
test_hotplug_device(test, dev);
opt = get_boot_option(ctx, 3);
check_resolved_local_resource(opt->boot_image, dev,
"/boot/memtest86+.bin");
+ check_not_present_resource(opt->initrd);
opt = get_boot_option(ctx, 4);
check_resolved_local_resource(opt->boot_image, dev,
"/boot/memtest86+.bin");
+ check_not_present_resource(opt->initrd);
}