diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-17 15:40:46 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-17 15:47:43 +0200 |
| commit | f93d8425c3897467798742d5f9ba871dca4a8e47 (patch) | |
| tree | 2c1849bd21bfc1e934a0080ef8a1b8afcc63589f /nixos/tests/installer.nix | |
| parent | 6563dd251fee81b50f5c27bc6e44c91829b51649 (diff) | |
| download | nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.tar nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.tar.gz nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.tar.bz2 nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.tar.lz nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.tar.xz nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.tar.zst nixpkgs-f93d8425c3897467798742d5f9ba871dca4a8e47.zip | |
Installer test: Fix booting from SCSI
This is required by the GRUB 1 test.
Diffstat (limited to 'nixos/tests/installer.nix')
| -rw-r--r-- | nixos/tests/installer.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 4feed56cd67..32be1ea23b9 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -175,7 +175,10 @@ let # installer. This ensures the target disk (/dev/vda) is # the same during and after installation. virtualisation.emptyDiskImages = [ 512 ]; - virtualisation.bootDevice = "/dev/vdb"; + virtualisation.bootDevice = + if grubVersion == 1 then "/dev/sdb" else "/dev/vdb"; + virtualisation.qemu.diskInterface = + if grubVersion == 1 then "scsi" else "virtio"; hardware.enableAllFirmware = mkForce false; |