summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-01-20 23:10:13 +0100
committerGitHub <noreply@github.com>2022-01-20 23:10:13 +0100
commitb1f70216575e22b001ccf109e81129ad2cfff45b (patch)
tree3346ebbc7e4009d7e429b6a1829f1b282c6ba5d3 /nixos
parenta2cae614d1f573e8055ecd913b9881d39268efb3 (diff)
downloadnixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.tar
nixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.tar.gz
nixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.tar.bz2
nixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.tar.lz
nixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.tar.xz
nixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.tar.zst
nixpkgs-b1f70216575e22b001ccf109e81129ad2cfff45b.zip
nixos/container-config: Only use `true` as fallback
LXC containers like those used by VPSAdminOS might want to install a bootloader
so passing `true` to `system.build.installBootLoader` without any priority specified,
causes a conflict for such systems with the recent `system.build` changes:

https://github.com/NixOS/nixpkgs/commit/4014fb6a64bc5f68326fc08cbaa83475db1fae8e

Fixes: https://github.com/NixOS/nixpkgs/issues/155839
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/container-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index 6ff6bdd30c2..0966ef84827 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -18,7 +18,7 @@ with lib;
     services.openssh.startWhenNeeded = mkDefault true;
 
     # Shut up warnings about not having a boot loader.
-    system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
+    system.build.installBootLoader = lib.mkDefault "${pkgs.coreutils}/bin/true";
 
     # Not supported in systemd-nspawn containers.
     security.audit.enable = false;