nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert Merge #107275: nixos: fix "nixos-rebuild ...

Browse Source 
... build-vm-with-bootloader" for EFI systems

(cherry picked from commit 57a787c9fa or reverted from 9a5a4c7053)
It breaks nixosTests.installer.simpleUefiSystemdBoot
and blocks nixos-20.09 channel.
This commit is contained in:
Vladimír Čunát
2020-12-23 20:58:12 +01:00
parent 47dbb876e1
commit ca119749d8
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/virtualisation/qemu-vm.nix
View File

@@ -596,10 +596,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.

1
nixos/tests/systemd-boot.nix
View File

@@ -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 ];