From 09b6859465f120bac4746db352b5a75b640659e1 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Wed, 1 Feb 2023 08:10:53 +0000
Subject: [PATCH] Update to cgroupv2 and move mount

---
 main/nnd-s6-services/APKBUILD                                 | 4 ++--
 main/nnd-s6-services/env/mount.dev-cgroup/OPTS                | 1 -
 main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS             | 1 +
 .../dependencies.d/mount.dev                                  | 0
 .../rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/down         | 2 +-
 .../{mount.dev-cgroup => mount.sys-fs-cgroup}/flag-essential  | 0
 .../rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/type         | 0
 .../rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/up           | 4 ++--
 8 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 main/nnd-s6-services/env/mount.dev-cgroup/OPTS
 create mode 100644 main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS
 rename main/nnd-s6-services/rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/dependencies.d/mount.dev (100%)
 rename main/nnd-s6-services/rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/down (66%)
 rename main/nnd-s6-services/rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/flag-essential (100%)
 rename main/nnd-s6-services/rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/type (100%)
 rename main/nnd-s6-services/rc/{mount.dev-cgroup => mount.sys-fs-cgroup}/up (50%)

diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD
index 973725b..7ddd1aa 100644
--- a/main/nnd-s6-services/APKBUILD
+++ b/main/nnd-s6-services/APKBUILD
@@ -3,8 +3,8 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=2.5
-pkgrel=1
+pkgver=2.6
+pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"
 builddir="$srcdir/"
diff --git a/main/nnd-s6-services/env/mount.dev-cgroup/OPTS b/main/nnd-s6-services/env/mount.dev-cgroup/OPTS
deleted file mode 100644
index 800ce98..0000000
--- a/main/nnd-s6-services/env/mount.dev-cgroup/OPTS
+++ /dev/null
@@ -1 +0,0 @@
-devices,cpu,memory,blkio,cpuset,cpuacct
diff --git a/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS b/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS
new file mode 100644
index 0000000..b5564cd
--- /dev/null
+++ b/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS
@@ -0,0 +1 @@
+rw,nosuid,nodev,noexec,relatime,nsdelegate
diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/dependencies.d/mount.dev
similarity index 100%
rename from main/nnd-s6-services/rc/mount.dev-cgroup/dependencies.d/mount.dev
rename to main/nnd-s6-services/rc/mount.sys-fs-cgroup/dependencies.d/mount.dev
diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/down b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/down
similarity index 66%
rename from main/nnd-s6-services/rc/mount.dev-cgroup/down
rename to main/nnd-s6-services/rc/mount.sys-fs-cgroup/down
index 2a1725e..f9fb845 100644
--- a/main/nnd-s6-services/rc/mount.dev-cgroup/down
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/down
@@ -1,4 +1,4 @@
 #!/bin/execlineb -P
-export DEST /dev/cgroup
+export DEST /sys/fs/cgroup
 
 exec /usr/libexec/nnd/s6/umount
diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/flag-essential b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/flag-essential
similarity index 100%
rename from main/nnd-s6-services/rc/mount.dev-cgroup/flag-essential
rename to main/nnd-s6-services/rc/mount.sys-fs-cgroup/flag-essential
diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/type b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/type
similarity index 100%
rename from main/nnd-s6-services/rc/mount.dev-cgroup/type
rename to main/nnd-s6-services/rc/mount.sys-fs-cgroup/type
diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/up b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up
similarity index 50%
rename from main/nnd-s6-services/rc/mount.dev-cgroup/up
rename to main/nnd-s6-services/rc/mount.sys-fs-cgroup/up
index cfcaa31..b63d408 100644
--- a/main/nnd-s6-services/rc/mount.dev-cgroup/up
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up
@@ -1,6 +1,6 @@
 #!/bin/execlineb -P
-s6-envdir -i /etc/s6/env/mount.dev-cgroup
-export DEST /dev/cgroup
+s6-envdir -i /etc/s6/env/mount.sys-fs-cgroup
+export DEST /sys/fs/cgroup
 export FSTYPE cgroup2
 
 exec /usr/libexec/nnd/s6/mount