Merge pull request containers#7029 from vrothberg/2.0-systemd-cleanups

[2.0] contrib/systemd cleanups
vrothberg · Jul 21, 2020 · 1b8d0e4 · 1b8d0e4
2 parents a5a5ad1 + 87ccd28
commit 1b8d0e4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 33 deletions.
diff --git a/contrib/systemd/system/podman.service b/contrib/systemd/system/podman.service
@@ -2,15 +2,12 @@
 Description=Podman API Service
 Requires=podman.socket
 After=podman.socket
-Documentation=man:podman-api(1)
+Documentation=man:podman-system-service(1)
 StartLimitIntervalSec=0
 
 [Service]
-Type=oneshot
-Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf
+Type=simple
 ExecStart=/usr/bin/podman system service
-TimeoutStopSec=30
-KillMode=process
 
 [Install]
 WantedBy=multi-user.target

diff --git a/contrib/systemd/system/podman.socket b/contrib/systemd/system/podman.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=Podman API Socket
-Documentation=man:podman-api(1)
+Documentation=man:podman-system-service(1)
 
 [Socket]
 ListenStream=%t/podman/podman.sock

diff --git a/contrib/systemd/user b/contrib/systemd/user
@@ -0,0 +1 @@
+./system/
diff --git a/contrib/systemd/user/podman.service b/contrib/systemd/user/podman.service
diff --git a/contrib/systemd/user/podman.socket b/contrib/systemd/user/podman.socket