summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2020-06-16 10:50:33 -0400
committerMatthew Heon <mheon@redhat.com>2020-06-16 11:09:48 -0400
commit20345b1ec0dc4fb64ce77400cad822f1fadb86f0 (patch)
treeea97d4e1ddc8dd999c1fdd1fc6103c056bd52f0b
parent0968f25988624699f2db559f0a984cf84c8a284f (diff)
downloadpodman-20345b1ec0dc4fb64ce77400cad822f1fadb86f0.tar.gz
podman-20345b1ec0dc4fb64ce77400cad822f1fadb86f0.tar.bz2
podman-20345b1ec0dc4fb64ce77400cad822f1fadb86f0.zip
Revert "Change Varlink systemd unit to use `system service`"
This reverts commit 1bc992bfc3a983b4d9ab53f778a545d83bcde94d. We originally thought `podman varlink` was entirely removed, but that was not true. We originally thought that `podman system service --varlink` worked the same as `podman varlink` but that was also not true. `system service` is broken when used under systemd units, and `podman varlink` still exists and works. Revert the change to `podman system service` to fix socket-activated Varlink under systemd. Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r--contrib/varlink/io.podman.service2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/varlink/io.podman.service b/contrib/varlink/io.podman.service
index 99d28560d..5be5329f4 100644
--- a/contrib/varlink/io.podman.service
+++ b/contrib/varlink/io.podman.service
@@ -6,7 +6,7 @@ Documentation=man:podman-varlink(1)
[Service]
Type=simple
-ExecStart=/usr/bin/podman system service --varlink --timeout=60000 unix:%t/podman/io.podman
+ExecStart=/usr/bin/podman varlink unix:%t/podman/io.podman --timeout=60000
TimeoutStopSec=30
KillMode=process