From 5532823726e8fe89cc33ed0c7bbcccba72268c82 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Thu, 15 Feb 2024 08:19:18 +0000 Subject: [PATCH] Add services to provide things not provided by devtmpfs or udev/mdev --- main/nnd-s6-services/APKBUILD | 2 +- main/nnd-s6-services/rc/bundle.core/contents.d/dir.dev-fd | 0 .../rc/bundle.core/contents.d/file.dev-stderr | 0 .../nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdin | 0 .../rc/bundle.core/contents.d/file.dev-stdout | 0 main/nnd-s6-services/rc/dir.dev-fd/dependencies.d/mount.dev | 0 main/nnd-s6-services/rc/dir.dev-fd/type | 1 + main/nnd-s6-services/rc/dir.dev-fd/up | 5 +++++ .../rc/file.dev-stderr/dependencies.d/mount.dev | 0 main/nnd-s6-services/rc/file.dev-stderr/type | 1 + main/nnd-s6-services/rc/file.dev-stderr/up | 5 +++++ .../rc/file.dev-stdin/dependencies.d/mount.dev | 0 main/nnd-s6-services/rc/file.dev-stdin/type | 1 + main/nnd-s6-services/rc/file.dev-stdin/up | 5 +++++ .../rc/file.dev-stdout/dependencies.d/mount.dev | 0 main/nnd-s6-services/rc/file.dev-stdout/type | 1 + main/nnd-s6-services/rc/file.dev-stdout/up | 5 +++++ main/nnd-s6-services/tmpl/link | 5 +++++ 18 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 main/nnd-s6-services/rc/bundle.core/contents.d/dir.dev-fd create mode 100644 main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stderr create mode 100644 main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdin create mode 100644 main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdout create mode 100644 main/nnd-s6-services/rc/dir.dev-fd/dependencies.d/mount.dev create mode 100644 main/nnd-s6-services/rc/dir.dev-fd/type create mode 100644 main/nnd-s6-services/rc/dir.dev-fd/up create mode 100644 main/nnd-s6-services/rc/file.dev-stderr/dependencies.d/mount.dev create mode 100644 main/nnd-s6-services/rc/file.dev-stderr/type create mode 100644 main/nnd-s6-services/rc/file.dev-stderr/up create mode 100644 main/nnd-s6-services/rc/file.dev-stdin/dependencies.d/mount.dev create mode 100644 main/nnd-s6-services/rc/file.dev-stdin/type create mode 100644 main/nnd-s6-services/rc/file.dev-stdin/up create mode 100644 main/nnd-s6-services/rc/file.dev-stdout/dependencies.d/mount.dev create mode 100644 main/nnd-s6-services/rc/file.dev-stdout/type create mode 100644 main/nnd-s6-services/rc/file.dev-stdout/up create mode 100755 main/nnd-s6-services/tmpl/link diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 81f200a..e786ed0 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.66 +pkgver=2.67 pkgrel=0 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/dir.dev-fd b/main/nnd-s6-services/rc/bundle.core/contents.d/dir.dev-fd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stderr b/main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stderr new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdin b/main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdin new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdout b/main/nnd-s6-services/rc/bundle.core/contents.d/file.dev-stdout new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/dir.dev-fd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/dir.dev-fd/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/dir.dev-fd/type b/main/nnd-s6-services/rc/dir.dev-fd/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/dir.dev-fd/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/dir.dev-fd/up b/main/nnd-s6-services/rc/dir.dev-fd/up new file mode 100644 index 0000000..42c70d2 --- /dev/null +++ b/main/nnd-s6-services/rc/dir.dev-fd/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export NAME /dev/fd +export TARGET /proc/self/fd + +/usr/libexec/nnd/s6/link diff --git a/main/nnd-s6-services/rc/file.dev-stderr/dependencies.d/mount.dev b/main/nnd-s6-services/rc/file.dev-stderr/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/file.dev-stderr/type b/main/nnd-s6-services/rc/file.dev-stderr/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/file.dev-stderr/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/file.dev-stderr/up b/main/nnd-s6-services/rc/file.dev-stderr/up new file mode 100644 index 0000000..a6fef30 --- /dev/null +++ b/main/nnd-s6-services/rc/file.dev-stderr/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export NAME /dev/stderr +export TARGET /proc/self/fd/2 + +/usr/libexec/nnd/s6/link diff --git a/main/nnd-s6-services/rc/file.dev-stdin/dependencies.d/mount.dev b/main/nnd-s6-services/rc/file.dev-stdin/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/file.dev-stdin/type b/main/nnd-s6-services/rc/file.dev-stdin/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/file.dev-stdin/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/file.dev-stdin/up b/main/nnd-s6-services/rc/file.dev-stdin/up new file mode 100644 index 0000000..1f8faaa --- /dev/null +++ b/main/nnd-s6-services/rc/file.dev-stdin/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export NAME /dev/stdin +export TARGET /proc/self/fd/0 + +/usr/libexec/nnd/s6/link diff --git a/main/nnd-s6-services/rc/file.dev-stdout/dependencies.d/mount.dev b/main/nnd-s6-services/rc/file.dev-stdout/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/file.dev-stdout/type b/main/nnd-s6-services/rc/file.dev-stdout/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/file.dev-stdout/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/file.dev-stdout/up b/main/nnd-s6-services/rc/file.dev-stdout/up new file mode 100644 index 0000000..36fcfeb --- /dev/null +++ b/main/nnd-s6-services/rc/file.dev-stdout/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +export NAME /dev/stdin +export TARGET /proc/self/fd/1 + +/usr/libexec/nnd/s6/link diff --git a/main/nnd-s6-services/tmpl/link b/main/nnd-s6-services/tmpl/link new file mode 100755 index 0000000..b8c088b --- /dev/null +++ b/main/nnd-s6-services/tmpl/link @@ -0,0 +1,5 @@ +#!/bin/execlineb -W +importas -i NAME NAME +importas -i TARGET TARGET + +ln -snf $TARGET $NAME