Update to cgroupv2 and move mount

2023-02-01 08:10:53 +00:00 · 2023-02-01 08:10:53 +00:00 · 09b6859465
parent 4ece709e43
commit 09b6859465
8 changed files with 6 additions and 6 deletions
--- 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/"
--- a/main/nnd-s6-services/env/mount.dev-cgroup/OPTS
+++ b/main/nnd-s6-services/env/mount.dev-cgroup/OPTS
@ -1 +0,0 @@
-devices,cpu,memory,blkio,cpuset,cpuacct
--- a/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS
+++ b/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS
@ -0,0 +1 @@
+rw,nosuid,nodev,noexec,relatime,nsdelegate
--- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/dependencies.d/mount.dev
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/dependencies.d/mount.dev
--- a/main/nnd-s6-services/rc/mount.sys-fs-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
--- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/flag-essential
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/flag-essential
--- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/type
+++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/type
--- a/main/nnd-s6-services/rc/mount.sys-fs-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