diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-07 18:20:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-07 18:24:15 +0200 |
| commit | fae135b8711daa852c11b02c7624e145da0e0148 (patch) | |
| tree | 5b0b7f26fd5e55282c7dcd70dcc88493be29a1af /nixos | |
| parent | 333bfe16c454d759e801425b5ef7cd435320a4b0 (diff) | |
| download | nixlib-fae135b8711daa852c11b02c7624e145da0e0148.tar nixlib-fae135b8711daa852c11b02c7624e145da0e0148.tar.gz nixlib-fae135b8711daa852c11b02c7624e145da0e0148.tar.bz2 nixlib-fae135b8711daa852c11b02c7624e145da0e0148.tar.lz nixlib-fae135b8711daa852c11b02c7624e145da0e0148.tar.xz nixlib-fae135b8711daa852c11b02c7624e145da0e0148.tar.zst nixlib-fae135b8711daa852c11b02c7624e145da0e0148.zip | |
Installer test: Increase amount of RAM
On x86_64, 384 MB is not enough anymore for running "nix-env -i". http://hydra.nixos.org/build/10865007
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/installer.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 782df7eab2a2..9149b1bff02f 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -98,6 +98,7 @@ let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if useEFI || grubVersion == 1 then "scsi" else "virtio"; qemuFlags = + (if iso.system == "x86_64-linux" then "-m 512 " else "-m 384 ") + (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") + (optionalString useEFI ''-L ${efiBios} -hda ''${\(Cwd::abs_path('harddisk'))} ''); hdFlags = optionalString (!useEFI) |