git.iko.soy/typeable/nixpkgs
on master help sign in
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.

commit57a787c9fa91f149c86a1ce83d57e07cfa589e07 authorVladimír Čunát <v@cunat.cz> dateWed 23 Dec 2020, 20:58 (6 years ago) parentbcf86f5
2 files changed+1−4
nixos/modules/virtualisation/qemu-vm.nix−4 nixos/tests/systemd-boot.nix+1
nixos/modules/virtualisation/qemu-vm.nix−4
@@ -605,10 +605,6 @@ in
605605
606606 virtualisation.bootDevice = mkDefault (driveDeviceName 1);
607607
608− virtualisation.useEFIBoot = mkDefault
609− (config.boot.loader.systemd-boot.enable ||
610− config.boot.loader.efi.canTouchEfiVariables);
611−
612608 virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
613609
614610 # FIXME: Consolidate this one day.
nixos/tests/systemd-boot.nix+1
@@ -9,6 +9,7 @@ with pkgs.lib;
99let
1010 common = {
1111 virtualisation.useBootLoader = true;
12+ virtualisation.useEFIBoot = true;
1213 boot.loader.systemd-boot.enable = true;
1314 boot.loader.efi.canTouchEfiVariables = true;
1415 environment.systemPackages = [ pkgs.efibootmgr ];