diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-10-19 05:24:28 +0200 |
commit | 457f28f6f85eea1b1671d62d2abe39297c9c90f7 (patch) | |
tree | 3c6e68534e7bfcde19893c830af7498b0606e6d2 /nixos/modules/virtualisation | |
parent | a25e03e76ae1e0367419db1de009e1139d08de68 (diff) | |
parent | 1aa7d4e6c61526606d9e26f939cdb60ec8f45fcd (diff) |
Merge branch 'master' into staging-next
; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/oci-containers.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 36a28efc6ce44..61066c3cbd758 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -304,12 +304,13 @@ let # ExecReload = ...; ### - Environment=if cfg.backend == "podman" then "PODMAN_SYSTEMD_UNIT=podman-${name}.service" else {}; - Type=if cfg.backend == "podman" then "notify" else {}; - NotifyAccess=if cfg.backend == "podman" then "all" else {}; TimeoutStartSec = 0; TimeoutStopSec = 120; Restart = "always"; + } // optionalAttrs (cfg.backend == "podman") { + Environment="PODMAN_SYSTEMD_UNIT=podman-${name}.service"; + Type="notify"; + NotifyAccess="all"; }; }; |