diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 447d1f091c8..b66ac144186 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -605,6 +605,10 @@ 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 7a663dd9b42..a37c87bccc2 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -9,7 +9,6 @@ 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 ];