summary refs log tree commit diff
path: root/nixos/modules/virtualisation/qemu-vm.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-12-23 20:58:12 +0100
committerVladimír Čunát <v@cunat.cz>2020-12-23 21:24:24 +0100
commit57a787c9fa91f149c86a1ce83d57e07cfa589e07 (patch)
tree709da02d8d9b4ff6eeec4d64fbff41d65750c25b /nixos/modules/virtualisation/qemu-vm.nix
parentbcf86f58ea095bcf5c5558d4d8291e8c564b4692 (diff)
downloadnixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.tar
nixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.tar.gz
nixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.tar.bz2
nixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.tar.lz
nixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.tar.xz
nixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.tar.zst
nixpkgs-57a787c9fa91f149c86a1ce83d57e07cfa589e07.zip
Revert Merge #107275: nixos: fix "nixos-rebuild ...
... build-vm-with-bootloader" for EFI systems

This reverts commit 20257280d9a3591a2888299a1aabfa850a0d0d08, reversing
changes made to 926a1b20949ddd66e3a4e1327cb1c1010ab10442.
It broke nixosTests.installer.simpleUefiSystemdBoot
and right now channel is lagging behing for two weeks.
Diffstat (limited to 'nixos/modules/virtualisation/qemu-vm.nix')
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index b66ac144186..447d1f091c8 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -605,10 +605,6 @@ in
 
     virtualisation.bootDevice = mkDefault (driveDeviceName 1);
 
-    virtualisation.useEFIBoot = mkDefault
-      (config.boot.loader.systemd-boot.enable ||
-       config.boot.loader.efi.canTouchEfiVariables);
-
     virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
 
     # FIXME: Consolidate this one day.