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

nixos-containers: Make sure same version of nixos-container is used

Browse Source 
Fixes #185126 (I hope)
This commit is contained in:
Philip Munksgaard 2022-08-04 13:49:00 +02:00
parent f559532e23
commit 3daea5fa9b
No known key found for this signature in database
GPG Key ID: 4CE62A90EFC0B9B2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -9,6 +9,10 @@ let
configurationDirectory = "/etc/${configurationDirectoryName}";
stateDirectory = "/var/lib/${configurationPrefix}containers";
nixos-container = pkgs.nixos-container.override {
inherit stateDirectory configurationDirectory;
};
# The container's init script, a small wrapper around the regular
# NixOS stage-2 init script.
containerInit = (cfg:
@ -248,7 +252,7 @@ let
ExecReload = pkgs.writeScript "reload-container"
''
#! ${pkgs.runtimeShell} -e
${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \
${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
'';
@ -866,9 +870,7 @@ in
'';
environment.systemPackages = [
(pkgs.nixos-container.override {
inherit stateDirectory configurationDirectory;
})
nixos-container
];
boot.kernelModules = [