diff options
| author | Felix Buehler <account@buehler.rocks> | 2023-06-25 12:25:42 +0200 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-06-25 11:01:34 -0300 |
| commit | 6672dde558ea2bdbb1ff12009574e02a3dd758e3 (patch) | |
| tree | 4d2eae2e923ef057389d2c5e03932c26782668f5 /nixos/modules/virtualisation | |
| parent | fa6b5a3cb318d80d9c1da868c76271c3891e59a3 (diff) | |
| download | nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.tar nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.tar.gz nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.tar.bz2 nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.tar.lz nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.tar.xz nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.tar.zst nixlib-6672dde558ea2bdbb1ff12009574e02a3dd758e3.zip | |
treewide: use optionalAttrs instead of 'else {}'
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/nixos-containers.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index c3949564d4bd..5df9942dbc04 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -800,14 +800,14 @@ in # declarative containers ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let containerConfig = cfg // ( - if cfg.enableTun then + optionalAttrs cfg.enableTun { allowedDevices = cfg.allowedDevices ++ [ { node = "/dev/net/tun"; modifier = "rw"; } ]; additionalCapabilities = cfg.additionalCapabilities ++ [ "CAP_NET_ADMIN" ]; } - else {}); + ); in recursiveUpdate unit { preStart = preStartScript containerConfig; @@ -817,7 +817,7 @@ in unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "${stateDirectory}/%i"; environment.root = if containerConfig.ephemeral then "/run/nixos-containers/%i" else "${stateDirectory}/%i"; } // ( - if containerConfig.autoStart then + optionalAttrs containerConfig.autoStart { wantedBy = [ "machines.target" ]; wants = [ "network.target" ]; @@ -828,7 +828,7 @@ in ]; restartIfChanged = true; } - else {}) + ) )) config.containers) )); |