diff options
| author | Graham Christensen <graham@grahamc.com> | 2019-06-06 08:43:46 -0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2019-06-06 11:57:05 -0400 |
| commit | e7872cda4bb213b3229cf35a7a001f172daf45fc (patch) | |
| tree | 83a222a5ae4a1b8733c423db0a7f7e500a469550 /nixos/modules/virtualisation | |
| parent | 0aeca5a7c760546cf8c20300bbadb69c19710a2b (diff) | |
| download | nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.tar nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.tar.gz nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.tar.bz2 nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.tar.lz nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.tar.xz nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.tar.zst nixlib-e7872cda4bb213b3229cf35a7a001f172daf45fc.zip | |
nixos containers: don't shadow config, rename to containerConfig
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index d10c4feecb43..604ad14b8384 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -689,7 +689,7 @@ in [{ name = "container@"; value = unit; }] # declarative containers ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let - config = cfg // ( + containerConfig = cfg // ( if cfg.enableTun then { allowedDevices = cfg.allowedDevices @@ -700,17 +700,17 @@ in else {}); in unit // { - preStart = preStartScript config; - script = startScript config; - postStart = postStartScript config; - serviceConfig = serviceDirectives config; + preStart = preStartScript containerConfig; + script = startScript containerConfig; + postStart = postStartScript containerConfig; + serviceConfig = serviceDirectives containerConfig; } // ( - if config.autoStart then + if containerConfig.autoStart then { wantedBy = [ "machines.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; - restartTriggers = [ config.path ]; + restartTriggers = [ containerConfig.path ]; reloadIfChanged = true; } else {}) |