summaryrefslogtreecommitdiff
path: root/contrib/systemd/user
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-07-20 10:50:27 +0200
committerValentin Rothberg <rothberg@redhat.com>2020-07-20 11:12:41 +0200
commit9312d458b4254b48e331d1ae40cb2f6d0fec9bd0 (patch)
tree66edea6c15fe5bc31d19e42ace91193cd9ac32f9 /contrib/systemd/user
parentb7b8fce82693ae0f9ebb0561cd3e6c118ad35fe9 (diff)
downloadpodman-9312d458b4254b48e331d1ae40cb2f6d0fec9bd0.tar.gz
podman-9312d458b4254b48e331d1ae40cb2f6d0fec9bd0.tar.bz2
podman-9312d458b4254b48e331d1ae40cb2f6d0fec9bd0.zip
systemd: symlink user->system
Symlink the user to the system services in `contrib/systemd`. There is no diference between the services, so we can reduce redundancy while not breaking downstream packages which might already be referencing `./contrib/systemd/user`. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'contrib/systemd/user')
l---------contrib/systemd/user1
-rw-r--r--contrib/systemd/user/podman.service17
-rw-r--r--contrib/systemd/user/podman.socket10
3 files changed, 1 insertions, 27 deletions
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