public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

This reverts commit 20257280d9, reversing
changes made to 926a1b2094.
It broke nixosTests.installer.simpleUefiSystemdBoot
and right now channel is lagging behing for two weeks.
This commit is contained in:
Vladimír Čunát 2020-12-23 20:58:12 +01:00
parent bcf86f58ea
commit 57a787c9fa
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -605,10 +605,6 @@ in
virtualisation.bootDevice = mkDefault (driveDeviceName 1); 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 ]; virtualisation.pathsInNixDB = [ config.system.build.toplevel ];
# FIXME: Consolidate this one day. # FIXME: Consolidate this one day.

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

@ -9,6 +9,7 @@ with pkgs.lib;
let let
common = { common = {
virtualisation.useBootLoader = true; virtualisation.useBootLoader = true;
virtualisation.useEFIBoot = true;
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
environment.systemPackages = [ pkgs.efibootmgr ]; environment.systemPackages = [ pkgs.efibootmgr ];