Merge pull request #3998 from cevich/idiot_proof_systemd_unit

Prevent podman varlink socket fight
containers · Sep 12, 2019 · 6ad1762 · 6ad1762
2 parents 3acfc3b + 9be2a6f
commit 6ad1762
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -8,3 +8,4 @@ SocketMode=0600
 
 [Install]
 WantedBy=sockets.target
+Also=multi-user.target