From 57a787c9fa91f149c86a1ce83d57e07cfa589e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 23 Dec 2020 20:58:12 +0100 Subject: [PATCH] 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. --- nixos/modules/virtualisation/qemu-vm.nix | 4 ---- nixos/tests/systemd-boot.nix | 1 + 2 files changed, 1 insertion(+), 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. diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index a37c87bccc2..7a663dd9b42 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -9,6 +9,7 @@ with pkgs.lib; let common = { virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; environment.systemPackages = [ pkgs.efibootmgr ];