summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-02-21 06:14:12 +0100
committerGitHub <noreply@github.com>2017-02-21 06:14:12 +0100
commit05c2c131824633e7e9b3006223750034856dff72 (patch)
tree4e6cbdc260f6388acb28585791f213d4918bdb44 /nixos/modules
parentbe30dcefb62890c09cd08a609d94fb197e3acfb5 (diff)
parent3dad33227f0b527569da022a3635d219d726b35d (diff)
downloadnixlib-05c2c131824633e7e9b3006223750034856dff72.tar
nixlib-05c2c131824633e7e9b3006223750034856dff72.tar.gz
nixlib-05c2c131824633e7e9b3006223750034856dff72.tar.bz2
nixlib-05c2c131824633e7e9b3006223750034856dff72.tar.lz
nixlib-05c2c131824633e7e9b3006223750034856dff72.tar.xz
nixlib-05c2c131824633e7e9b3006223750034856dff72.tar.zst
nixlib-05c2c131824633e7e9b3006223750034856dff72.zip
Merge pull request #22715 from phi-gamma/fix-22709-xen-domU
xen: update domU config for pvgrub2
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/virtualisation/xen-domU.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index 8dd0d1dbfd2c..b46002c10b54 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
@@ -3,11 +3,8 @@
 { config, pkgs, ... }:
 
 {
-  # We're being booted using pv-grub, which means that we need to
-  # generate a GRUB 1 menu without actually installing GRUB.
-  boot.loader.grub.version = 1;
+  boot.loader.grub.version = 2;
   boot.loader.grub.device = "nodev";
-  boot.loader.grub.extraPerEntryConfig = "root (hd0)";
 
   boot.initrd.kernelModules =
     [ "xen-blkfront" "xen-tpmfront" "xen-kbdfront" "xen-fbfront"