diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-12 22:54:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 22:54:37 +0200 |
| commit | 6ad17623d5361e1970070db667ae710fcc67fa82 (patch) | |
| tree | 308713b88546ca2365557a1fac7505fc74415a22 | |
| parent | 3acfc3b7df593aaf4838b0eb4e8f24e9e54d998c (diff) | |
| parent | 9be2a6f908ee80c7410cb0c3121359d87f366f28 (diff) | |
| download | podman-6ad17623d5361e1970070db667ae710fcc67fa82.tar.gz podman-6ad17623d5361e1970070db667ae710fcc67fa82.tar.bz2 podman-6ad17623d5361e1970070db667ae710fcc67fa82.zip | |
Merge pull request #3998 from cevich/idiot_proof_systemd_unit
Prevent podman varlink socket fight
| -rw-r--r-- | contrib/varlink/io.podman.service | 5 | ||||
| -rw-r--r-- | contrib/varlink/io.podman.socket | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/varlink/io.podman.service b/contrib/varlink/io.podman.service index 725198e79..5be5329f4 100644 --- a/contrib/varlink/io.podman.service +++ b/contrib/varlink/io.podman.service @@ -6,8 +6,9 @@ Documentation=man:podman-varlink(1) [Service] Type=simple -ExecStart=/usr/bin/podman varlink unix:%t/podman/io.podman -KillMode=none +ExecStart=/usr/bin/podman varlink unix:%t/podman/io.podman --timeout=60000 +TimeoutStopSec=30 +KillMode=process [Install] WantedBy=multi-user.target diff --git a/contrib/varlink/io.podman.socket b/contrib/varlink/io.podman.socket index f6a3ddc49..629a5dd20 100644 --- a/contrib/varlink/io.podman.socket +++ b/contrib/varlink/io.podman.socket @@ -8,3 +8,4 @@ SocketMode=0600 [Install] WantedBy=sockets.target +Also=multi-user.target |