diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-09-17 12:23:09 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-09-17 12:31:59 +0200 |
| commit | 4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a (patch) | |
| tree | 3ce64c829a09edf73073c2b580bc6200b2154dfe /nixos/modules/virtualisation/virtualbox-image.nix | |
| parent | effe0309ee503bc9b45c3d071004f606018e62c4 (diff) | |
| download | nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.tar nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.tar.gz nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.tar.bz2 nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.tar.lz nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.tar.xz nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.tar.zst nixpkgs-4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a.zip | |
nixos/virtualbox-image: Enable PAE on 32bit.
pkgs/os-specific/linux/kernel/common-config.nix defines HIGHMEM64G on line 441 for 32bit systems, which implies PAE. We now creating the OVA with PAE support enabled, which fixes bootup of the image if people are just importing it without setting PAE explicitly. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos/modules/virtualisation/virtualbox-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-image.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index c1538feb9df..ca2c4035cc9 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -110,6 +110,7 @@ in { --ostype ${if pkgs.stdenv.system == "x86_64-linux" then "Linux26_64" else "Linux26"} VBoxManage modifyvm "$vmName" \ --memory 1536 --acpi on --vram 10 \ + ${optionalString (pkgs.stdenv.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ --audiocontroller ac97 --audio alsa \ --rtcuseutc on \ |