diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 09:52:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 09:52:49 -0400 |
| commit | 1b8d0e454353224a571bcec7d37240140ec7917f (patch) | |
| tree | 0f4e94f44b57891753b56b9171a0c4fd7408a3f5 | |
| parent | a5a5ad184ef8e890bfd083052005e6d862c62729 (diff) | |
| parent | 87ccd28d06a6369e6f386b0a687a744bee15b1f1 (diff) | |
| download | podman-1b8d0e454353224a571bcec7d37240140ec7917f.tar.gz podman-1b8d0e454353224a571bcec7d37240140ec7917f.tar.bz2 podman-1b8d0e454353224a571bcec7d37240140ec7917f.zip | |
Merge pull request #7029 from vrothberg/2.0-systemd-cleanups
[2.0] contrib/systemd cleanups
| -rw-r--r-- | contrib/systemd/system/podman.service | 7 | ||||
| -rw-r--r-- | contrib/systemd/system/podman.socket | 2 | ||||
| l--------- | contrib/systemd/user | 1 | ||||
| -rw-r--r-- | contrib/systemd/user/podman.service | 17 | ||||
| -rw-r--r-- | contrib/systemd/user/podman.socket | 10 |
5 files changed, 4 insertions, 33 deletions
diff --git a/contrib/systemd/system/podman.service b/contrib/systemd/system/podman.service index eaa2ec437..4a63735a3 100644 --- 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 index 8b22e31e4..397058ee4 100644 --- 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 new file mode 120000 index 000000000..3f3d9896b --- /dev/null +++ b/contrib/systemd/user @@ -0,0 +1 @@ +./system/
\ No newline at end of file diff --git a/contrib/systemd/user/podman.service b/contrib/systemd/user/podman.service deleted file mode 100644 index eaa2ec437..000000000 --- a/contrib/systemd/user/podman.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Podman API Service -Requires=podman.socket -After=podman.socket -Documentation=man:podman-api(1) -StartLimitIntervalSec=0 - -[Service] -Type=oneshot -Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf -ExecStart=/usr/bin/podman system service -TimeoutStopSec=30 -KillMode=process - -[Install] -WantedBy=multi-user.target -Also=podman.socket diff --git a/contrib/systemd/user/podman.socket b/contrib/systemd/user/podman.socket deleted file mode 100644 index 8b22e31e4..000000000 --- a/contrib/systemd/user/podman.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Podman API Socket -Documentation=man:podman-api(1) - -[Socket] -ListenStream=%t/podman/podman.sock -SocketMode=0660 - -[Install] -WantedBy=sockets.target |