Re: [PR PATCH] [Updated] podman: add runit service

[lemmi <lemmi@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

There is an updated pull request by lemmi against master on the void-packages repository

https://github.com/lemmi/void-packages podman
https://github.com/void-linux/void-packages/pull/36102

podman: add runit service
[Upstream Systemd service](https://github.com/containers/podman/blob/v4.0.2/contrib/systemd/system/podman.service.in) doesn't do anything special. `--time=0 unix:///var/run/docker.sock` is required, since we don't have socket activation.

A patch file from https://github.com/void-linux/void-packages/pull/36102.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-podman-36102.patch --]
[-- Type: text/x-diff, Size: 2588 bytes --]

From 57606372d0cda4cf4c68b3a4a3c2465dde8e611b Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 11 Mar 2022 22:37:26 +0100
Subject: [PATCH] podman: add runit service

---
 srcpkgs/podman/files/podman-docker/finish | 3 +++
 srcpkgs/podman/files/podman-docker/run    | 4 ++++
 srcpkgs/podman/files/podman/log/run       | 1 +
 srcpkgs/podman/files/podman/run           | 4 ++++
 srcpkgs/podman/template                   | 4 +++-
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/podman/files/podman-docker/finish
 create mode 100755 srcpkgs/podman/files/podman-docker/run
 create mode 120000 srcpkgs/podman/files/podman/log/run
 create mode 100755 srcpkgs/podman/files/podman/run

diff --git a/srcpkgs/podman/files/podman-docker/finish b/srcpkgs/podman/files/podman-docker/finish
new file mode 100755
index 000000000000..884b37f53b63
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ "$(realpath /run/docker.sock)" = "/run/podman/podman.sock" ] && rm /run/docker.sock
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
new file mode 100755
index 000000000000..3125a4f89ed9
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ln -sf /run/podman/podman.sock /run/docker.sock
+exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/podman/files/podman/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
new file mode 100755
index 000000000000..8eb8f41752e4
--- /dev/null
+++ b/srcpkgs/podman/files/podman/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index c719e4ca6057..95e0531abad8 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -34,4 +34,6 @@ post_install() {
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
+	vsv podman
+	vsv podman-docker
 }