summary refs log tree commit diff
path: root/lib/test-driver/Machine.pm
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-26 15:52:05 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-26 16:02:33 -0400
commit87ae76866537cb1a09e202a439c0fb4eb3d93fb9 (patch)
treeeb670f2b2141e4f4debc7757af8e5be4edd084e3 /lib/test-driver/Machine.pm
parent1a2b3cc5e4209fdf15ab1abf17ace8c08b48ddf8 (diff)
downloadnixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.tar
nixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.tar.gz
nixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.tar.bz2
nixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.tar.lz
nixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.tar.xz
nixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.tar.zst
nixpkgs-87ae76866537cb1a09e202a439c0fb4eb3d93fb9.zip
Fix the LVM installer test
GRUB 2 doesn't want to boot off a LVM disk:

machine# installing the GRUB 2 boot loader on /dev/vda...
machine# Path `/boot/grub' is not readable by GRUB on boot. Installation is impossible. Aborting.
machine# /nix/store/7yc535h1lim1a5gkhjb3fr6c8193dv8w-install-grub.pl: installation of GRUB on /dev/vda failed

In theory GRUB 2 supports booting from LVM, but we probably need to
generate the right grub.conf (see
https://wiki.archlinux.org/index.php/GRUB2#LVM).

http://hydra.nixos.org/build/2904680
Diffstat (limited to 'lib/test-driver/Machine.pm')
-rw-r--r--lib/test-driver/Machine.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index 947291b52c4..9018dc589e4 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -29,10 +29,9 @@ sub new {
         $startCommand =
             "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
-        my $iface = $args->{hdaInterface} or "virtio";
+        my $iface = $args->{hdaInterface} || "virtio";
         $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
             if defined $args->{hda};
-        
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
         $startCommand .= $args->{qemuFlags} || "";