diff options
| author | Richard Jones <rjones@redhat.com> | 2010-06-03 11:49:38 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-06-03 11:49:38 +0100 |
| commit | 8fca8549edb1581448fa45d08d90bad399c5dbfa (patch) | |
| tree | c4abdcf24366de3e4533c545cf98afbaf29578c3 | |
| parent | dccd9b8f525cfae49b89c38066d752e6c054c7f6 (diff) | |
| download | libguestfs-8fca8549edb1581448fa45d08d90bad399c5dbfa.tar.gz libguestfs-8fca8549edb1581448fa45d08d90bad399c5dbfa.tar.xz libguestfs-8fca8549edb1581448fa45d08d90bad399c5dbfa.zip | |
grub-install: Enable grub-install tests and create explicit device.map file.
| -rwxr-xr-x | src/generator.ml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/generator.ml b/src/generator.ml index cc34676c..5cd704f4 100755 --- a/src/generator.ml +++ b/src/generator.ml @@ -2320,11 +2320,14 @@ any partition tables, filesystem superblocks and so on. See also: C<guestfs_zero_device>, C<guestfs_scrub_device>."); ("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", "\ |