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

nixos containers: don't shadow config, rename to containerConfig

Browse source
This commit is contained in:
Graham Christensen 2019-06-06 08:43:46 -04:00
parent 0aeca5a7c7
commit e7872cda4b
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
nixos/modules/virtualisation/containers.nix
View file

@ -689,7 +689,7 @@ in
[{ name = "container@"; value = unit; }] [{ name = "container@"; value = unit; }]
# declarative containers # declarative containers
++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let
config = cfg // ( containerConfig = cfg // (
if cfg.enableTun then if cfg.enableTun then
{ {
allowedDevices = cfg.allowedDevices allowedDevices = cfg.allowedDevices
@ -700,17 +700,17 @@ in
else {}); else {});
in in
unit // { unit // {
preStart = preStartScript config; preStart = preStartScript containerConfig;
script = startScript config; script = startScript containerConfig;
postStart = postStartScript config; postStart = postStartScript containerConfig;
serviceConfig = serviceDirectives config; serviceConfig = serviceDirectives containerConfig;
} // ( } // (
if config.autoStart then if containerConfig.autoStart then
{ {
wantedBy = [ "machines.target" ]; wantedBy = [ "machines.target" ];
wants = [ "network.target" ]; wants = [ "network.target" ];
after = [ "network.target" ]; after = [ "network.target" ];
restartTriggers = [ config.path ]; restartTriggers = [ containerConfig.path ];
reloadIfChanged = true; reloadIfChanged = true;
} }
else {}) else {})