diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-03-07 21:23:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 21:23:51 +0100 |
| commit | 5f39678474d97acfdcdfbb2b571859e31b7ddb2c (patch) | |
| tree | 30b6eb36a7726f8c3d752d0b3d7896f886e935bb /nixos/modules/virtualisation | |
| parent | 4acea60939d7ef30ba41bff81310f15563e463f5 (diff) | |
| parent | 81f21e39368705ec725a1aec7dc885b64930578c (diff) | |
| download | nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.tar nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.tar.gz nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.tar.bz2 nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.tar.lz nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.tar.xz nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.tar.zst nixlib-5f39678474d97acfdcdfbb2b571859e31b7ddb2c.zip | |
Merge pull request #292552 from diogotcorreia/oci-containers-fix-stop-one-shot
nixos/oci-containers: ignore nonexistent container when stopping
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/oci-containers.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index a88715587d65..5bffb3f04716 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -312,7 +312,7 @@ let preStop = if cfg.backend == "podman" then "podman stop --ignore --cidfile=/run/podman-${escapedName}.ctr-id" - else "${cfg.backend} stop ${name}"; + else "${cfg.backend} stop ${name} || true"; postStop = if cfg.backend == "podman" then "podman rm -f --ignore --cidfile=/run/podman-${escapedName}.ctr-id" |