summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2017-02-12 20:53:49 +0100
committerPhilipp Gesang <phg@phi-gamma.net>2017-02-12 20:53:54 +0100
commit3dad33227f0b527569da022a3635d219d726b35d (patch)
tree53396cd2f4b67378f2d5467d4a62addcce75bd18
parent2dba30af721d452000917a55a21a722331b113df (diff)
downloadnixpkgs-3dad33227f0b527569da022a3635d219d726b35d.tar
nixpkgs-3dad33227f0b527569da022a3635d219d726b35d.tar.gz
nixpkgs-3dad33227f0b527569da022a3635d219d726b35d.tar.bz2
nixpkgs-3dad33227f0b527569da022a3635d219d726b35d.tar.lz
nixpkgs-3dad33227f0b527569da022a3635d219d726b35d.tar.xz
nixpkgs-3dad33227f0b527569da022a3635d219d726b35d.tar.zst
nixpkgs-3dad33227f0b527569da022a3635d219d726b35d.zip
xen: update domU config for pvgrub2
fix #22709

Recent pvgrub (from Grub built with “--with-platform=xen”) understands
the Grub2 configuration format. Grub legacy configuration (menu.lst) is
ignored.
-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 8dd0d1dbfd2..b46002c10b5 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"