From d32e4b7d9fcfc5b3c060b9f50514777b075ffaf2 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Sun, 17 Mar 2024 17:41:57 +0000
Subject: [PATCH] Add podman socket

---
 main/nnd-s6-services/APKBUILD                             | 2 +-
 .../rc/dir.run-podman/dependencies.d/mount.run            | 0
 main/nnd-s6-services/rc/dir.run-podman/type               | 1 +
 main/nnd-s6-services/rc/dir.run-podman/up                 | 4 ++++
 .../rc/podman.service/dependencies.d/dir.run-podman       | 0
 main/nnd-s6-services/rc/podman.service/run                | 8 ++++++++
 main/nnd-s6-services/rc/podman.service/type               | 1 +
 7 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 main/nnd-s6-services/rc/dir.run-podman/dependencies.d/mount.run
 create mode 100644 main/nnd-s6-services/rc/dir.run-podman/type
 create mode 100644 main/nnd-s6-services/rc/dir.run-podman/up
 create mode 100644 main/nnd-s6-services/rc/podman.service/dependencies.d/dir.run-podman
 create mode 100755 main/nnd-s6-services/rc/podman.service/run
 create mode 100644 main/nnd-s6-services/rc/podman.service/type

diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index e786ed0..0dd0984 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.67
+pkgver=2.69
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
diff --git a/main/nnd-s6-services/rc/dir.run-podman/dependencies.d/mount.run b/main/nnd-s6-services/rc/dir.run-podman/dependencies.d/mount.run
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/dir.run-podman/type b/main/nnd-s6-services/rc/dir.run-podman/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/dir.run-podman/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/dir.run-podman/up b/main/nnd-s6-services/rc/dir.run-podman/up
new file mode 100644
index 0000000..e9652ff
--- /dev/null
+++ b/main/nnd-s6-services/rc/dir.run-podman/up
@@ -0,0 +1,4 @@
+#!/bin/execlineb -P
+export DIR /run/podman
+
+/usr/libexec/nnd/s6/dir
diff --git a/main/nnd-s6-services/rc/podman.service/dependencies.d/dir.run-podman b/main/nnd-s6-services/rc/podman.service/dependencies.d/dir.run-podman
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/podman.service/run b/main/nnd-s6-services/rc/podman.service/run
new file mode 100755
index 0000000..c9325b6
--- /dev/null
+++ b/main/nnd-s6-services/rc/podman.service/run
@@ -0,0 +1,8 @@
+#!/bin/execlineb -P
+importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME
+importas -i XDG_RUNTIME_DIR XDG_RUNTIME_DIR
+
+s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/podman.service
+importas -D unix://${XDG_RUNTIME_DIR}/podman/podman.sock URI URI
+
+podman system service --time=0 $URI
diff --git a/main/nnd-s6-services/rc/podman.service/type b/main/nnd-s6-services/rc/podman.service/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/main/nnd-s6-services/rc/podman.service/type
@@ -0,0 +1 @@
+longrun