diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-02 17:30:42 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-02 17:31:57 +0000 |
| commit | ba0582670796acdeeb9ab0001a7edd0b08290d4f (patch) | |
| tree | e71239033c08e329c0740a0e4130e1e706914eb7 /nixos | |
| parent | 0c1ed282f03cbcff8b695acb61872e1bb8a1a6da (diff) | |
| download | nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.tar nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.tar.gz nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.tar.bz2 nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.tar.lz nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.tar.xz nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.tar.zst nixlib-ba0582670796acdeeb9ab0001a7edd0b08290d4f.zip | |
Attempt to fix transient grub1 test kernel panics
Example: http://hydra.nixos.org/build/32469819/nixlog/26/raw
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/installer.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 84fdb027ed85..9e5a6ad04e1e 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -46,7 +46,7 @@ let , grubIdentifier, preBootCommands, extraConfig }: let - iface = if grubVersion == 1 then "scsi" else "virtio"; + iface = if grubVersion == 1 then "ide" else "virtio"; qemuFlags = (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + (optionalString (system == "x86_64-linux") "-cpu kvm64 "); |