diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-01-12 20:32:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-12 20:32:57 +0100 |
| commit | 945b645eb32d40d83bd09f5b418dd969880f3fd4 (patch) | |
| tree | 9c8cb2ad30062bd2a1ea82853909339f108f1f4f | |
| parent | 87cf581bff3c10a0364af6143fbb7c5f41edf166 (diff) | |
| parent | b5a672576ad12fb35e592a0c5fc9b2c710b45fbc (diff) | |
| download | vyos-1x-1.4.0-rc2.tar.gz vyos-1x-1.4.0-rc2.zip | |
Merge pull request #2815 from vyos/mergify/bp/sagitta/pr-28141.4.0-rc2
T5925: Containers change systemd KillMode (backport #2814)
| -rw-r--r-- | data/templates/container/systemd-unit.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/templates/container/systemd-unit.j2 b/data/templates/container/systemd-unit.j2 index fa48384ab..d379f0a07 100644 --- a/data/templates/container/systemd-unit.j2 +++ b/data/templates/container/systemd-unit.j2 @@ -13,5 +13,5 @@ ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n.cid -t 5 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n.cid ExecStopPost=/bin/rm -f %t/%n.cid PIDFile=%t/%n.pid -KillMode=none +KillMode=control-group Type=forking |