From 8fca8549edb1581448fa45d08d90bad399c5dbfa Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 3 Jun 2010 11:49:38 +0100 Subject: [PATCH] grub-install: Enable grub-install tests and create explicit device.map file. --- src/generator.ml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/generator.ml b/src/generator.ml index cc34676..5cd704f 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2320,11 +2320,14 @@ any partition tables, filesystem superblocks and so on. See also: C, C."); ("grub_install", (RErr, [Pathname "root"; Device "device"]), 86, [], - (* Test disabled because grub-install incompatible with virtio-blk driver. - * See also: https://bugzilla.redhat.com/show_bug.cgi?id=479760 + (* See: + * https://bugzilla.redhat.com/show_bug.cgi?id=484986 + * https://bugzilla.redhat.com/show_bug.cgi?id=479760 *) - [InitBasicFS, Disabled, TestOutputTrue ( - [["grub_install"; "/"; "/dev/sda1"]; + [InitBasicFS, Always, TestOutputTrue ( + [["mkdir_p"; "/boot/grub"]; + ["write"; "/boot/grub/device.map"; "(hd0) /dev/vda"]; + ["grub_install"; "/"; "/dev/vda"]; ["is_dir"; "/boot"]])], "install GRUB", "\ -- 1.8.3.1