From c889294b24ed2829fe106d0d992a9685ce7fb596 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 17 Sep 2015 12:23:09 +0200 Subject: [PATCH] nixos/virtualbox-image: Enable PAE on 32bit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 4e23f1f908c8d888d80bdc7f1f1d9a666851bc2a) Signed-off-by: Domen Kožar --- nixos/modules/virtualisation/virtualbox-image.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index c1538feb9df5..ca2c4035cc9f 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 \