diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 6d08a84..9742487 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/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" diff --git a/main/nnd-s6-services/env/mount.dev-cgroup/OPTS b/main/nnd-s6-services/env/mount.dev-cgroup/OPTS new file mode 100644 index 0000000..800ce98 --- /dev/null +++ b/main/nnd-s6-services/env/mount.dev-cgroup/OPTS @@ -0,0 +1 @@ +devices,cpu,memory,blkio,cpuset,cpuacct diff --git a/main/nnd-s6-services/env/mount.dev-hugepages/OPTS b/main/nnd-s6-services/env/mount.dev-hugepages/OPTS new file mode 100644 index 0000000..28a30fc --- /dev/null +++ b/main/nnd-s6-services/env/mount.dev-hugepages/OPTS @@ -0,0 +1 @@ +pagesize=2M diff --git a/main/nnd-s6-services/env/sys.kernel-mm-ksm-run/VAL b/main/nnd-s6-services/env/sys.kernel-mm-ksm-run/VAL new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/main/nnd-s6-services/env/sys.kernel-mm-ksm-run/VAL @@ -0,0 +1 @@ +1 diff --git a/main/nnd-s6-services/env/sys.kernel-mm-transparent_hugepage-enabled/VAL b/main/nnd-s6-services/env/sys.kernel-mm-transparent_hugepage-enabled/VAL new file mode 100644 index 0000000..11ff653 --- /dev/null +++ b/main/nnd-s6-services/env/sys.kernel-mm-transparent_hugepage-enabled/VAL @@ -0,0 +1 @@ +madvise diff --git a/main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL b/main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL new file mode 100644 index 0000000..83b33d2 --- /dev/null +++ b/main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL @@ -0,0 +1 @@ +1000 diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.dev-cgroup/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/down b/main/nnd-s6-services/rc/mount.dev-cgroup/down new file mode 100644 index 0000000..cf69586 --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/flag-essential b/main/nnd-s6-services/rc/mount.dev-cgroup/flag-essential new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/type b/main/nnd-s6-services/rc/mount.dev-cgroup/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.dev-cgroup/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/up b/main/nnd-s6-services/rc/mount.dev-cgroup/up new file mode 100644 index 0000000..dad4199 --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.dev-hugepages/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/down b/main/nnd-s6-services/rc/mount.dev-hugepages/down new file mode 100644 index 0000000..da74387 --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/flag-essential b/main/nnd-s6-services/rc/mount.dev-hugepages/flag-essential new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/type b/main/nnd-s6-services/rc/mount.dev-hugepages/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.dev-hugepages/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/up b/main/nnd-s6-services/rc/mount.dev-hugepages/up new file mode 100644 index 0000000..99a9dfb --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up index 3b85b84..606cbc5 100644 --- a/main/nnd-s6-services/rc/mount.dev-mqueue/up +++ b/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 diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up index a83e9dd..360aba9 100644 --- a/main/nnd-s6-services/rc/mount.dev-shm/up +++ b/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 diff --git a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up index 122d319..17d9c43 100644 --- a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up +++ b/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 } diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up index 97e569a..e523286 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up +++ b/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 } diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/up b/main/nnd-s6-services/rc/mount.sys-kernel-security/up index 091a186..d40db34 100644 --- a/main/nnd-s6-services/rc/mount.sys-kernel-security/up +++ b/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 } diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/dependencies.d/mount.sys b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/dependencies.d/mount.sys new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down new file mode 100644 index 0000000..54c7eda --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/type b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up new file mode 100644 index 0000000..3707cea --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/dependencies.d/mount.sys b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/dependencies.d/mount.sys new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down new file mode 100644 index 0000000..31b94e6 --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/type b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up new file mode 100644 index 0000000..324f88c --- /dev/null +++ b/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 diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.sys b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.sys new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down new file mode 100644 index 0000000..a2b36b6 --- /dev/null +++ b/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} diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/type b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up new file mode 100644 index 0000000..a2a49ce --- /dev/null +++ b/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} diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/sys.kernel-mm-ksm-run b/main/nnd-s6-services/rc/virtqemud/dependencies.d/sys.kernel-mm-ksm-run new file mode 100644 index 0000000..e69de29