movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 20:55:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
nixos-containers: Make sure same version of nixos-container is used
This commit is contained in:
adisbladis 2022-11-17 22:13:44 +13:00 • committed by GitHub
commit 841bcc7a24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
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}"; configurationDirectory = "/etc/${configurationDirectoryName}";
stateDirectory = "/var/lib/${configurationPrefix}containers"; 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 # The container's init script, a small wrapper around the regular
# NixOS stage-2 init script. # NixOS stage-2 init script.
containerInit = (cfg: containerInit = (cfg:
@ -250,7 +254,7 @@ let
ExecReload = pkgs.writeScript "reload-container" ExecReload = pkgs.writeScript "reload-container"
'' ''
#! ${pkgs.runtimeShell} -e #! ${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" bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test"
''; '';
@ -868,9 +872,7 @@ in
''; '';
environment.systemPackages = [ environment.systemPackages = [
(pkgs.nixos-container.override { nixos-container
inherit stateDirectory configurationDirectory;
})
]; ];
boot.kernelModules = [ boot.kernelModules = [