Merge pull request #185129 from Munksgaard/fix-nixos-container

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

Changed files
+6 -4
nixos
modules
virtualisation
+6 -4
nixos/modules/virtualisation/nixos-containers.nix
···
configurationDirectory = "/etc/${configurationDirectoryName}";
stateDirectory = "/var/lib/${configurationPrefix}containers";
# The container's init script, a small wrapper around the regular
# NixOS stage-2 init script.
containerInit = (cfg:
···
ExecReload = pkgs.writeScript "reload-container"
''
#! ${pkgs.runtimeShell} -e
-
${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \
bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
'';
···
'';
environment.systemPackages = [
-
(pkgs.nixos-container.override {
-
inherit stateDirectory configurationDirectory;
-
})
];
boot.kernelModules = [
···
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:
···
ExecReload = pkgs.writeScript "reload-container"
''
#! ${pkgs.runtimeShell} -e
+
${nixos-container}/bin/nixos-container run "$INSTANCE" -- \
bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
'';
···
'';
environment.systemPackages = [
+
nixos-container
];
boot.kernelModules = [