Update services

- Add services
	- cgroups
	- hugepages
	- ksm
- Change some mismatched namings that were harmless
- Add KSM as default dependency for QEMU libvirt backend

main/nnd-s6-services/APKBUILD

@@ -3,7 +3,7 @@
 . ../../APKBUILD.template
 
 pkgname=nnd-s6-services
-pkgver=1.11
+pkgver=1.14
 pkgrel=0
 pkgdesc="Base services for s6"
 depends="s6-rc s6-portable-utils s6-linux-utils"

main/nnd-s6-services/env/mount.dev-cgroup/OPTS

@@ -0,0 +1 @@
+devices,cpu,memory,blkio,cpuset,cpuacct

main/nnd-s6-services/env/mount.dev-hugepages/OPTS

@@ -0,0 +1 @@
+pagesize=2M

main/nnd-s6-services/env/sys.kernel-mm-ksm-run/VAL

@@ -0,0 +1 @@
+1

main/nnd-s6-services/env/sys.kernel-mm-transparent_hugepage-enabled/VAL

@@ -0,0 +1 @@
+madvise

main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL

@@ -0,0 +1 @@
+1000

main/nnd-s6-services/rc/mount.dev-cgroup/down

@@ -0,0 +1,12 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define DEST /dev/cgroup
+
+fdclose 1
+fdclose 2
+
+exec umount $DEST

main/nnd-s6-services/rc/mount.dev-cgroup/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/mount.dev-cgroup/up

@@ -0,0 +1,17 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/mount.dev-cgroup
+importas -i OPTS OPTS
+emptyenv
+
+export PATH $PATH
+define DEST /dev/cgroup
+define FSTYPE cgroup
+
+fdclose 1
+fdclose 2
+
+foreground {
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST

main/nnd-s6-services/rc/mount.dev-hugepages/down

@@ -0,0 +1,12 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define DEST /dev/hugepages
+
+fdclose 1
+fdclose 2
+
+exec umount $DEST

main/nnd-s6-services/rc/mount.dev-hugepages/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/mount.dev-hugepages/up

@@ -0,0 +1,17 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/mount.dev-hugepages
+importas -i OPTS OPTS
+emptyenv
+
+export PATH $PATH
+define DEST /dev/hugepages
+define FSTYPE hugetlbfs
+
+fdclose 1
+fdclose 2
+
+foreground {
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS none $DEST

main/nnd-s6-services/rc/mount.dev-mqueue/up

@@ -13,9 +13,5 @@ fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS mqueue $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS mqueue $DEST

main/nnd-s6-services/rc/mount.dev-shm/up

@@ -13,9 +13,5 @@ fdclose 1
 fdclose 2
 
 foreground {
-	foreground {
-		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS shm $DEST
-} if -nt {
-	importas status ? test $status -eq 1
-}
+	exec mkdir -p $DEST
+} exec mount -t $FSTYPE -o $OPTS shm $DEST

main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up

@@ -15,7 +15,7 @@ fdclose 2
 foreground {
 	foreground {
 		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS securityfs $DEST
+	} exec mount -t $FSTYPE -o $OPTS none $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/mount.sys-fs-pstore/up

@@ -15,7 +15,7 @@ fdclose 2
 foreground {
 	foreground {
 		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS securityfs $DEST
+	} exec mount -t $FSTYPE -o $OPTS none $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/mount.sys-kernel-security/up

@@ -15,7 +15,7 @@ fdclose 2
 foreground {
 	foreground {
 		exec mkdir -p $DEST
-	} exec mount -t $FSTYPE -o $OPTS securityfs $DEST
+	} exec mount -t $FSTYPE -o $OPTS none $DEST
 } if -nt {
 	importas status ? test $status -eq 1
 }

main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define FPATH /sys/kernel/mm/ksm/run
+define VAL 0
+
+fdclose 1
+fdclose 2
+
+redirfd -w 1 $FPATH echo $VAL

main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up

@@ -0,0 +1,14 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run
+importas -i VAL VAL
+emptyenv
+
+export PATH $PATH
+define FPATH /sys/kernel/mm/ksm/run
+
+fdclose 1
+fdclose 2
+
+redirfd -w 1 $FPATH echo $VAL

main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define FPATH /sys/kernel/mm/transparent_hugepage/enabled
+define VAL never
+
+fdclose 1
+fdclose 2
+
+redirfd -w 1 $FPATH echo $VAL

main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up

@@ -0,0 +1,14 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled
+importas -i VAL VAL
+emptyenv
+
+export PATH $PATH
+define FPATH /sys/kernel/mm/transparent_hugepage/enabled
+
+fdclose 1
+fdclose 2
+
+redirfd -w 1 $FPATH echo $VAL

main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down

@@ -0,0 +1,13 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+emptyenv
+
+export PATH $PATH
+define SYSCTL vm/nr_hugepages
+define VAL 0
+
+fdclose 1
+fdclose 2
+
+exec sysctl -w ${SYSCTL}=${VAL}

main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/type

@@ -0,0 +1 @@
+oneshot

main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up

@@ -0,0 +1,14 @@
+#!/bin/execlineb -P
+s6-envdir -i /etc/s6/env/path
+importas -i PATH PATH
+s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages
+importas -i VAL VAL
+emptyenv
+
+export PATH $PATH
+define SYSCTL vm/nr_hugepages
+
+fdclose 1
+fdclose 2
+
+exec sysctl -w ${SYSCTL}=${VAL}