From 50003c8cba6082308b2a3edb17ef90be8dc0e0f3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 22 Apr 2013 13:59:01 +0100 Subject: [PATCH] grub-install: Change test to use /dev/sda instead of /dev/vda. The previous test for grub-install hard-coded /dev/vda (ie. assuming virtio-blk instead of more modern virtio-scsi). This changes the test to hard-code /dev/sda instead. However this change is still not correct since /dev/sda will be adjusted by block device name translation in the call to grub-install, but not what is written to /boot/grub/device.map. Since we no longer support grub-install on Fedora, this won't affect things, but Ubuntu still has a 'grub-install' command (although it's actually from grub2). --- generator/actions.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/actions.ml b/generator/actions.ml index f2b94577c..f25280d5c 100644 --- a/generator/actions.ml +++ b/generator/actions.ml @@ -4766,8 +4766,8 @@ C" }; tests = [ InitBasicFS, Always, TestResultTrue ( [["mkdir_p"; "/boot/grub"]; - ["write"; "/boot/grub/device.map"; "(hd0) /dev/vda"]; - ["grub_install"; "/"; "/dev/vda"]; + ["write"; "/boot/grub/device.map"; "(hd0) /dev/sda"]; + ["grub_install"; "/"; "/dev/sda"]; ["is_dir"; "/boot"]]) ]; shortdesc = "install GRUB 1";