summaryrefslogtreecommitdiff
path: root/pkg/systemd/generate/systemdgen_test.go
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-03-05 14:05:48 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-03-05 14:05:48 +0100
commita5c04c793e5e3d4d7c52a2281205fcace4f2534a (patch)
tree6c2601a0902358e9c9585bae68de1b1a1b3054b7 /pkg/systemd/generate/systemdgen_test.go
parent9ffc525da70ba497f38df04dd6d3670170200071 (diff)
downloadpodman-a5c04c793e5e3d4d7c52a2281205fcace4f2534a.tar.gz
podman-a5c04c793e5e3d4d7c52a2281205fcace4f2534a.tar.bz2
podman-a5c04c793e5e3d4d7c52a2281205fcace4f2534a.zip
generate systemd: remove leading slashes
Remove leading slashes from the run-dir paths. It was meant to make it explicit that we're dealing with an absolute path but user feedback has shown that most are aware. It also cleans up the path in the systemctl status output. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/systemd/generate/systemdgen_test.go')
-rw-r--r--pkg/systemd/generate/systemdgen_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/systemd/generate/systemdgen_test.go b/pkg/systemd/generate/systemdgen_test.go
index a68a02d33..145296ea9 100644
--- a/pkg/systemd/generate/systemdgen_test.go
+++ b/pkg/systemd/generate/systemdgen_test.go
@@ -131,11 +131,11 @@ After=network-online.target
[Service]
Restart=always
-ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
-ExecStart=/usr/bin/podman run --conmon-pidfile /%t/%n-pid --cidfile /%t/%n-cid --cgroups=no-conmon --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN
-ExecStop=/usr/bin/podman stop --ignore --cidfile /%t/%n-cid -t 42
-ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile /%t/%n-cid
-PIDFile=/%t/%n-pid
+ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
+ExecStart=/usr/bin/podman run --conmon-pidfile %t/%n-pid --cidfile %t/%n-cid --cgroups=no-conmon --name jadda-jadda --hostname hello-world awesome-image:latest command arg1 ... argN
+ExecStop=/usr/bin/podman stop --ignore --cidfile %t/%n-cid -t 42
+ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/%n-cid
+PIDFile=%t/%n-pid
KillMode=none
Type=forking