From 9312d458b4254b48e331d1ae40cb2f6d0fec9bd0 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 20 Jul 2020 10:50:27 +0200 Subject: 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 --- contrib/systemd/user | 1 + contrib/systemd/user/podman.service | 17 ----------------- contrib/systemd/user/podman.socket | 10 ---------- 3 files changed, 1 insertion(+), 27 deletions(-) create mode 120000 contrib/systemd/user delete mode 100644 contrib/systemd/user/podman.service delete mode 100644 contrib/systemd/user/podman.socket (limited to 'contrib/systemd') 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 -- cgit v1.2.3-54-g00ecf