From 6031a2dfe3631897fdb132d900f0ee17d186120a Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Thu, 14 Sep 2023 11:25:55 +0000
Subject: [PATCH] Add machineid init

---
 main/nnd-s6-services/APKBUILD                      |  2 +-
 .../rc/bundle.core/contents.d/machineid            |  0
 .../rc/machineid/dependencies.d/mount.root         |  0
 main/nnd-s6-services/rc/machineid/type             |  1 +
 main/nnd-s6-services/rc/machineid/up               | 14 ++++++++++++++
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 main/nnd-s6-services/rc/bundle.core/contents.d/machineid
 create mode 100644 main/nnd-s6-services/rc/machineid/dependencies.d/mount.root
 create mode 100644 main/nnd-s6-services/rc/machineid/type
 create mode 100644 main/nnd-s6-services/rc/machineid/up

diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 74ed01c..805ff5d 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.50
+pkgver=2.51
 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/machineid b/main/nnd-s6-services/rc/bundle.core/contents.d/machineid
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/machineid/dependencies.d/mount.root b/main/nnd-s6-services/rc/machineid/dependencies.d/mount.root
new file mode 100644
index 0000000..e69de29
diff --git a/main/nnd-s6-services/rc/machineid/type b/main/nnd-s6-services/rc/machineid/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/main/nnd-s6-services/rc/machineid/type
@@ -0,0 +1 @@
+oneshot
diff --git a/main/nnd-s6-services/rc/machineid/up b/main/nnd-s6-services/rc/machineid/up
new file mode 100644
index 0000000..6ea0ae2
--- /dev/null
+++ b/main/nnd-s6-services/rc/machineid/up
@@ -0,0 +1,14 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+emptyenv -p
+
+if -n { [ -r /etc/machine-id ] }
+	redirfd -w 1 /etc/machine-id
+		foreground {
+			pipeline {
+				pipeline {
+					cat /dev/urandom
+				} tr -dc abcdef[:digit:]
+			} head -c 32
+		}
+		printf "\n"