diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 4a16be6..5cdcaa9 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.30 -pkgrel=0 +pkgver=2.40 +pkgrel=1 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" builddir="$srcdir/" diff --git a/main/nnd-s6-services/env/bird/CONFIG b/main/nnd-s6-services/env/bird/CONFIG deleted file mode 100644 index 0a1a8c4..0000000 --- a/main/nnd-s6-services/env/bird/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/bird/bird.conf diff --git a/main/nnd-s6-services/env/ceph.osd.0/DEV b/main/nnd-s6-services/env/ceph.osd.0/DEV deleted file mode 100644 index 79b00e8..0000000 --- a/main/nnd-s6-services/env/ceph.osd.0/DEV +++ /dev/null @@ -1 +0,0 @@ -/dev/ceph-00000000-0000-0000-0000-000000000000/osd-block-00000000-0000-0000-0000-000000000000 diff --git a/main/nnd-s6-services/env/getty.tty1/BAUD b/main/nnd-s6-services/env/getty.tty1/BAUD deleted file mode 100644 index 573541a..0000000 --- a/main/nnd-s6-services/env/getty.tty1/BAUD +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/main/nnd-s6-services/env/gortr/ENDPOINT b/main/nnd-s6-services/env/gortr/ENDPOINT deleted file mode 100644 index 3ffc3ea..0000000 --- a/main/nnd-s6-services/env/gortr/ENDPOINT +++ /dev/null @@ -1 +0,0 @@ -https://dn42.burble.com/roa/dn42_roa_46.json diff --git a/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.4/ADDR b/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.4/ADDR deleted file mode 100644 index 5fc2f62..0000000 --- a/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.4/ADDR +++ /dev/null @@ -1 +0,0 @@ -172.22.12.1/32 diff --git a/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.6/ADDR b/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.6/ADDR deleted file mode 100644 index 2b82ef6..0000000 --- a/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.6/ADDR +++ /dev/null @@ -1 +0,0 @@ -fd42:42:42::2:1/128 diff --git a/main/nnd-s6-services/env/interface.wg-tunnel.static.route.4/ROUTE b/main/nnd-s6-services/env/interface.wg-tunnel.static.route.4/ROUTE deleted file mode 100644 index 8290df6..0000000 --- a/main/nnd-s6-services/env/interface.wg-tunnel.static.route.4/ROUTE +++ /dev/null @@ -1 +0,0 @@ -172.22.12.0/24 diff --git a/main/nnd-s6-services/env/interface.wg-tunnel.static.route.6/ROUTE b/main/nnd-s6-services/env/interface.wg-tunnel.static.route.6/ROUTE deleted file mode 100644 index 0fe3bf6..0000000 --- a/main/nnd-s6-services/env/interface.wg-tunnel.static.route.6/ROUTE +++ /dev/null @@ -1 +0,0 @@ -fd42:42:42::2:0/120 diff --git a/main/nnd-s6-services/env/mdevd/KBUFSZ b/main/nnd-s6-services/env/mdevd/KBUFSZ deleted file mode 100644 index 354b252..0000000 --- a/main/nnd-s6-services/env/mdevd/KBUFSZ +++ /dev/null @@ -1 +0,0 @@ -500000 diff --git a/main/nnd-s6-services/env/mount.boot-efi/FSTYPE b/main/nnd-s6-services/env/mount.boot-efi/FSTYPE deleted file mode 100644 index 1506af7..0000000 --- a/main/nnd-s6-services/env/mount.boot-efi/FSTYPE +++ /dev/null @@ -1 +0,0 @@ -vfat diff --git a/main/nnd-s6-services/env/mount.boot-efi/OPTS b/main/nnd-s6-services/env/mount.boot-efi/OPTS deleted file mode 100644 index 16feab0..0000000 --- a/main/nnd-s6-services/env/mount.boot-efi/OPTS +++ /dev/null @@ -1 +0,0 @@ -rw diff --git a/main/nnd-s6-services/env/mount.boot-efi/SRC b/main/nnd-s6-services/env/mount.boot-efi/SRC deleted file mode 100644 index d9799a8..0000000 --- a/main/nnd-s6-services/env/mount.boot-efi/SRC +++ /dev/null @@ -1 +0,0 @@ -LABEL=nnd-efi diff --git a/main/nnd-s6-services/env/mount.boot/FSTYPE b/main/nnd-s6-services/env/mount.boot/FSTYPE deleted file mode 100644 index bbc92b3..0000000 --- a/main/nnd-s6-services/env/mount.boot/FSTYPE +++ /dev/null @@ -1 +0,0 @@ -ext4 diff --git a/main/nnd-s6-services/env/mount.boot/OPTS b/main/nnd-s6-services/env/mount.boot/OPTS deleted file mode 100644 index 16feab0..0000000 --- a/main/nnd-s6-services/env/mount.boot/OPTS +++ /dev/null @@ -1 +0,0 @@ -rw diff --git a/main/nnd-s6-services/env/mount.boot/SRC b/main/nnd-s6-services/env/mount.boot/SRC deleted file mode 100644 index e52baf5..0000000 --- a/main/nnd-s6-services/env/mount.boot/SRC +++ /dev/null @@ -1 +0,0 @@ -LABEL=nnd-boot diff --git a/main/nnd-s6-services/env/mount.dev-hugepages/OPTS b/main/nnd-s6-services/env/mount.dev-hugepages/OPTS deleted file mode 100644 index 28a30fc..0000000 --- a/main/nnd-s6-services/env/mount.dev-hugepages/OPTS +++ /dev/null @@ -1 +0,0 @@ -pagesize=2M diff --git a/main/nnd-s6-services/env/mount.dev-mqueue/OPTS b/main/nnd-s6-services/env/mount.dev-mqueue/OPTS deleted file mode 100644 index 7152202..0000000 --- a/main/nnd-s6-services/env/mount.dev-mqueue/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,noexec,nodev diff --git a/main/nnd-s6-services/env/mount.dev-pts/OPTS b/main/nnd-s6-services/env/mount.dev-pts/OPTS deleted file mode 100644 index 96655f4..0000000 --- a/main/nnd-s6-services/env/mount.dev-pts/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,noexec,mode=620,ptmxmode=000 diff --git a/main/nnd-s6-services/env/mount.dev-shm/OPTS b/main/nnd-s6-services/env/mount.dev-shm/OPTS deleted file mode 100644 index bbb27c9..0000000 --- a/main/nnd-s6-services/env/mount.dev-shm/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,noexec,nodev,inode64 diff --git a/main/nnd-s6-services/env/mount.dev/OPTS b/main/nnd-s6-services/env/mount.dev/OPTS deleted file mode 100644 index 0c214c1..0000000 --- a/main/nnd-s6-services/env/mount.dev/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,noexec,size=10240k,nr_inodes=2028666,mode=755,inode64 diff --git a/main/nnd-s6-services/env/mount.proc/OPTS b/main/nnd-s6-services/env/mount.proc/OPTS deleted file mode 100644 index 8491f59..0000000 --- a/main/nnd-s6-services/env/mount.proc/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,nodev,noexec,hidepid=2 diff --git a/main/nnd-s6-services/env/mount.root/FSTYPE b/main/nnd-s6-services/env/mount.root/FSTYPE deleted file mode 100644 index 00531f6..0000000 --- a/main/nnd-s6-services/env/mount.root/FSTYPE +++ /dev/null @@ -1 +0,0 @@ -btrfs diff --git a/main/nnd-s6-services/env/mount.root/OPTS b/main/nnd-s6-services/env/mount.root/OPTS deleted file mode 100644 index 1cd1ced..0000000 --- a/main/nnd-s6-services/env/mount.root/OPTS +++ /dev/null @@ -1 +0,0 @@ -remount,rw diff --git a/main/nnd-s6-services/env/mount.root/SRC b/main/nnd-s6-services/env/mount.root/SRC deleted file mode 100644 index 621e94f..0000000 --- a/main/nnd-s6-services/env/mount.root/SRC +++ /dev/null @@ -1 +0,0 @@ -none diff --git a/main/nnd-s6-services/env/mount.run/OPTS b/main/nnd-s6-services/env/mount.run/OPTS deleted file mode 100644 index 1ba7198..0000000 --- a/main/nnd-s6-services/env/mount.run/OPTS +++ /dev/null @@ -1 +0,0 @@ -nodev,nosuid,size=3259832k,nr_inodes=819200,mode=755,inode64 diff --git a/main/nnd-s6-services/env/mount.sys-firmware-efi-efivars/OPTS b/main/nnd-s6-services/env/mount.sys-firmware-efi-efivars/OPTS deleted file mode 100644 index 1712d5b..0000000 --- a/main/nnd-s6-services/env/mount.sys-firmware-efi-efivars/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,nodev,noexec diff --git a/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS b/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS deleted file mode 100644 index b5564cd..0000000 --- a/main/nnd-s6-services/env/mount.sys-fs-cgroup/OPTS +++ /dev/null @@ -1 +0,0 @@ -rw,nosuid,nodev,noexec,relatime,nsdelegate diff --git a/main/nnd-s6-services/env/mount.sys-fs-pstore/OPTS b/main/nnd-s6-services/env/mount.sys-fs-pstore/OPTS deleted file mode 100644 index 1712d5b..0000000 --- a/main/nnd-s6-services/env/mount.sys-fs-pstore/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,nodev,noexec diff --git a/main/nnd-s6-services/env/mount.sys-kernel-security/OPTS b/main/nnd-s6-services/env/mount.sys-kernel-security/OPTS deleted file mode 100644 index 1712d5b..0000000 --- a/main/nnd-s6-services/env/mount.sys-kernel-security/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,nodev,noexec diff --git a/main/nnd-s6-services/env/mount.sys/OPTS b/main/nnd-s6-services/env/mount.sys/OPTS deleted file mode 100644 index 1712d5b..0000000 --- a/main/nnd-s6-services/env/mount.sys/OPTS +++ /dev/null @@ -1 +0,0 @@ -nosuid,nodev,noexec diff --git a/main/nnd-s6-services/env/mount.tmp/OPTS b/main/nnd-s6-services/env/mount.tmp/OPTS deleted file mode 100644 index e8ac604..0000000 --- a/main/nnd-s6-services/env/mount.tmp/OPTS +++ /dev/null @@ -1 +0,0 @@ -nodev,nosuid diff --git a/main/nnd-s6-services/env/nftables/RULEDIR b/main/nnd-s6-services/env/nftables/RULEDIR deleted file mode 100644 index 1bfd88f..0000000 --- a/main/nnd-s6-services/env/nftables/RULEDIR +++ /dev/null @@ -1 +0,0 @@ -/etc/nnd/nftables/ diff --git a/main/nnd-s6-services/env/nftables/RULESET b/main/nnd-s6-services/env/nftables/RULESET deleted file mode 100644 index 835dc19..0000000 --- a/main/nnd-s6-services/env/nftables/RULESET +++ /dev/null @@ -1 +0,0 @@ -/etc/nnd/nftables/loadall diff --git a/main/nnd-s6-services/env/ntpd.1/NTPS b/main/nnd-s6-services/env/ntpd.1/NTPS deleted file mode 100644 index a15b6c9..0000000 --- a/main/nnd-s6-services/env/ntpd.1/NTPS +++ /dev/null @@ -1 +0,0 @@ -2.pool.ntp.org diff --git a/main/nnd-s6-services/env/radvd/CONFIG b/main/nnd-s6-services/env/radvd/CONFIG deleted file mode 100644 index 32bf3d1..0000000 --- a/main/nnd-s6-services/env/radvd/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/radvd/radvd.conf diff --git a/main/nnd-s6-services/env/sshd.1/SSHDCFG b/main/nnd-s6-services/env/sshd.1/SSHDCFG deleted file mode 100644 index d8ea5df..0000000 --- a/main/nnd-s6-services/env/sshd.1/SSHDCFG +++ /dev/null @@ -1 +0,0 @@ -/etc/ssh/sshd_config diff --git a/main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL b/main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL deleted file mode 100644 index d00491f..0000000 --- a/main/nnd-s6-services/env/sys.kernel-mm-ksm-merge_across_nodes/VAL +++ /dev/null @@ -1 +0,0 @@ -1 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 deleted file mode 100644 index d00491f..0000000 --- a/main/nnd-s6-services/env/sys.kernel-mm-ksm-run/VAL +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 11ff653..0000000 --- a/main/nnd-s6-services/env/sys.kernel-mm-transparent_hugepage-enabled/VAL +++ /dev/null @@ -1 +0,0 @@ -madvise diff --git a/main/nnd-s6-services/env/sysctl.kernel-hostname/VAL b/main/nnd-s6-services/env/sysctl.kernel-hostname/VAL deleted file mode 100644 index 5fb4555..0000000 --- a/main/nnd-s6-services/env/sysctl.kernel-hostname/VAL +++ /dev/null @@ -1 +0,0 @@ -nnd-localhost diff --git a/main/nnd-s6-services/env/sysctl.net-ipv4-tcp_l3mdev_accept/VAL b/main/nnd-s6-services/env/sysctl.net-ipv4-tcp_l3mdev_accept/VAL deleted file mode 100644 index d00491f..0000000 --- a/main/nnd-s6-services/env/sysctl.net-ipv4-tcp_l3mdev_accept/VAL +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/main/nnd-s6-services/env/sysctl.net-ipv4-udp_l3mdev_accept/VAL b/main/nnd-s6-services/env/sysctl.net-ipv4-udp_l3mdev_accept/VAL deleted file mode 100644 index d00491f..0000000 --- a/main/nnd-s6-services/env/sysctl.net-ipv4-udp_l3mdev_accept/VAL +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/main/nnd-s6-services/env/sysctl.net-ipv6-conf-all-keep_addr_on_down/VAL b/main/nnd-s6-services/env/sysctl.net-ipv6-conf-all-keep_addr_on_down/VAL deleted file mode 100644 index d00491f..0000000 --- a/main/nnd-s6-services/env/sysctl.net-ipv6-conf-all-keep_addr_on_down/VAL +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/main/nnd-s6-services/env/sysctl.net-ipv6-conf-default-keep_addr_on_down/VAL b/main/nnd-s6-services/env/sysctl.net-ipv6-conf-default-keep_addr_on_down/VAL deleted file mode 100644 index d00491f..0000000 --- a/main/nnd-s6-services/env/sysctl.net-ipv6-conf-default-keep_addr_on_down/VAL +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL b/main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL deleted file mode 100644 index 83b33d2..0000000 --- a/main/nnd-s6-services/env/sysctl.vm-nr_hugepages/VAL +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/main/nnd-s6-services/env/vrf.vrf-mynet/TABLE b/main/nnd-s6-services/env/vrf.vrf-mynet/TABLE deleted file mode 100644 index f599e28..0000000 --- a/main/nnd-s6-services/env/vrf.vrf-mynet/TABLE +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/main/nnd-s6-services/env/wg-config.wg-tunnel/CONFIG b/main/nnd-s6-services/env/wg-config.wg-tunnel/CONFIG deleted file mode 100644 index dc5d853..0000000 --- a/main/nnd-s6-services/env/wg-config.wg-tunnel/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/wireguard/wg-tunnel diff --git a/main/nnd-s6-services/rc/bird/dependencies.d/vrf.vrf-mynet.link b/main/nnd-s6-services/rc/binfmt.qemu-aarch64/dependencies.d/module.binfmt_misc similarity index 100% rename from main/nnd-s6-services/rc/bird/dependencies.d/vrf.vrf-mynet.link rename to main/nnd-s6-services/rc/binfmt.qemu-aarch64/dependencies.d/module.binfmt_misc diff --git a/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/binfmt.qemu-aarch64/dependencies.d/mount.proc-sys-fs-binfmt_misc similarity index 100% rename from main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/binfmt.qemu-aarch64/dependencies.d/mount.proc-sys-fs-binfmt_misc diff --git a/main/nnd-s6-services/rc/bird/run b/main/nnd-s6-services/rc/bird/run index c0281ad..d2dd851 100755 --- a/main/nnd-s6-services/rc/bird/run +++ b/main/nnd-s6-services/rc/bird/run @@ -1,6 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/bird -importas -i CONFIG CONFIG +s6-envdir -I /etc/s6/env/bird +importas -D /etc/bird/bird.conf CONFIG CONFIG s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/type b/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/type deleted file mode 100644 index 757b422..0000000 --- a/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/type +++ /dev/null @@ -1 +0,0 @@ -bundle diff --git a/main/nnd-s6-services/rc/gortr/run b/main/nnd-s6-services/rc/gortr/run index ddd23a6..209c9ba 100755 --- a/main/nnd-s6-services/rc/gortr/run +++ b/main/nnd-s6-services/rc/gortr/run @@ -1,6 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/gortr -importas -i ENDPOINT ENDPOINT +s6-envdir -I /etc/s6/env/gortr +importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.create/down b/main/nnd-s6-services/rc/interface.wg-tunnel.create/down deleted file mode 100644 index e2a2fda..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.create/down +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip link del dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.create/up b/main/nnd-s6-services/rc/interface.wg-tunnel.create/up deleted file mode 100644 index 272fe49..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.create/up +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip link add $INTERFACE type wireguard diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.link/down b/main/nnd-s6-services/rc/interface.wg-tunnel.link/down deleted file mode 100644 index 1af6cef..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.link/down +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip link set dev $INTERFACE down diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.link/up b/main/nnd-s6-services/rc/interface.wg-tunnel.link/up deleted file mode 100644 index d6180fc..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.link/up +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/path -emptyenv - -ip link set dev $INTERFACE up diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down deleted file mode 100644 index 675f512..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4 -importas -i ADDR ADDR - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -4 address del $ADDR dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up deleted file mode 100644 index 04f7204..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.4 -importas -i ADDR ADDR - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -4 address add $ADDR dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down deleted file mode 100644 index ea7147c..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6 -importas -i ADDR ADDR - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 address del $ADDR dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up deleted file mode 100644 index 0f51025..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.addr.6 -importas -i ADDR ADDR - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 address add $ADDR dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down deleted file mode 100644 index e785fce..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4 -importas -i ROUTE ROUTE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -4 route del $ROUTE dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up deleted file mode 100644 index 210e96d..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.4 -importas -i ROUTE ROUTE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -4 route add $ROUTE dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down deleted file mode 100644 index 98a8b8b..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6 -importas -i ROUTE ROUTE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 route del $ROUTE dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up deleted file mode 100644 index 0953e35..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/interface.${INTERFACE}.static.route.6 -importas -i ROUTE ROUTE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 route add $ROUTE dev $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.4 b/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.4 deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.6 b/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.6 deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static/type deleted file mode 100644 index 757b422..0000000 --- a/main/nnd-s6-services/rc/interface.wg-tunnel.static/type +++ /dev/null @@ -1 +0,0 @@ -bundle diff --git a/main/nnd-s6-services/rc/mdevd/run b/main/nnd-s6-services/rc/mdevd/run index 6386d83..ae484fb 100755 --- a/main/nnd-s6-services/rc/mdevd/run +++ b/main/nnd-s6-services/rc/mdevd/run @@ -1,8 +1,8 @@ #!/bin/execlineb -P define NOTIFYFD 3 -s6-envdir -i /etc/s6/env/mdevd -importas -i KBUFSZ KBUFSZ +s6-envdir -I /etc/s6/env/mdevd +importas -D 500000 KBUFSZ KBUFSZ s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/module.binfmt_misc/down b/main/nnd-s6-services/rc/module.binfmt_misc/down new file mode 100644 index 0000000..322f802 --- /dev/null +++ b/main/nnd-s6-services/rc/module.binfmt_misc/down @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export MODULE binfmt_misc + +/usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.static b/main/nnd-s6-services/rc/module.binfmt_misc/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.static rename to main/nnd-s6-services/rc/module.binfmt_misc/flag-essential diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.create/type b/main/nnd-s6-services/rc/module.binfmt_misc/type similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.create/type rename to main/nnd-s6-services/rc/module.binfmt_misc/type diff --git a/main/nnd-s6-services/rc/module.binfmt_misc/up b/main/nnd-s6-services/rc/module.binfmt_misc/up new file mode 100644 index 0000000..71588ff --- /dev/null +++ b/main/nnd-s6-services/rc/module.binfmt_misc/up @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export MODULE binfmt_misc + +/usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/mount.boot-efi/up b/main/nnd-s6-services/rc/mount.boot-efi/up index 7880117..abae0b4 100644 --- a/main/nnd-s6-services/rc/mount.boot-efi/up +++ b/main/nnd-s6-services/rc/mount.boot-efi/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +export SRC LABEL=nnd-efi +export OPTS rw +export FSTYPE vfat +s6-envdir -I /etc/s6/env/mount.boot-efi + export DEST /boot/efi - -s6-envdir -i /etc/s6/env/mount.boot-efi - /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.boot/up b/main/nnd-s6-services/rc/mount.boot/up index b901c9c..b3ec643 100644 --- a/main/nnd-s6-services/rc/mount.boot/up +++ b/main/nnd-s6-services/rc/mount.boot/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +export SRC LABEL=nnd-boot +export OPTS rw +export FSTYPE ext4 +s6-envdir -I /etc/s6/env/mount.boot + export DEST /boot - -s6-envdir -i /etc/s6/env/mount.boot - /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/up b/main/nnd-s6-services/rc/mount.dev-hugepages/up index ef43eea..811f3ad 100644 --- a/main/nnd-s6-services/rc/mount.dev-hugepages/up +++ b/main/nnd-s6-services/rc/mount.dev-hugepages/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /dev/hugepages +export OPTS pagesize=2M export FSTYPE hugetlbfs +s6-envdir -I /etc/s6/env/mount.dev-hugepages -s6-envdir -i /etc/s6/env/mount.dev-hugepages - +export DEST /dev/hugepages /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up index a04baf9..781c40f 100644 --- a/main/nnd-s6-services/rc/mount.dev-mqueue/up +++ b/main/nnd-s6-services/rc/mount.dev-mqueue/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /dev/mqueue +export OPTS nosuid,noexec,nodev export FSTYPE mqueue +s6-envdir -I /etc/s6/env/mount.dev-mqueue -s6-envdir -i /etc/s6/env/mount.dev-mqueue - +export DEST /dev/mqueue /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-pts/up b/main/nnd-s6-services/rc/mount.dev-pts/up index 1714981..53ecfc4 100644 --- a/main/nnd-s6-services/rc/mount.dev-pts/up +++ b/main/nnd-s6-services/rc/mount.dev-pts/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /dev/pts +export OPTS nosuid,noexec,mode=620,ptmxmode=000 export FSTYPE devpts +s6-envdir -I /etc/s6/env/mount.dev-pts -s6-envdir -i /etc/s6/env/mount.dev-pts - +export DEST /dev/pts /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up index d6bb88f..36a4fd6 100644 --- a/main/nnd-s6-services/rc/mount.dev-shm/up +++ b/main/nnd-s6-services/rc/mount.dev-shm/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /dev/shm +export OPTS nosuid,noexec,nodev,inode64 export FSTYPE tmpfs +s6-envdir -I /etc/s6/env/mount.dev-shm -s6-envdir -i /etc/s6/env/mount.dev-shm - +export DEST /dev/shm /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev/up b/main/nnd-s6-services/rc/mount.dev/up index 88a131c..7b92b9b 100644 --- a/main/nnd-s6-services/rc/mount.dev/up +++ b/main/nnd-s6-services/rc/mount.dev/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /dev +export OPTS nosuid,noexec,size=10240k,nr_inodes=2028666,mode=755,inode64 export FSTYPE devtmpfs +s6-envdir -I /etc/s6/env/mount.dev -s6-envdir -i /etc/s6/env/mount.dev - +export DEST /dev /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.create/dependencies.d/module.wireguard b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/dependencies.d/module.binfmt_misc similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.create/dependencies.d/module.wireguard rename to main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/dependencies.d/module.binfmt_misc diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.link/dependencies.d/wg-config.wg-tunnel b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/dependencies.d/mount.proc similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.link/dependencies.d/wg-config.wg-tunnel rename to main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/dependencies.d/mount.proc diff --git a/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/down b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/down new file mode 100644 index 0000000..97a1302 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/down @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export DEST /proc/sys/fs/binfmt_misc + +/usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/flag-essential diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.link/type b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/type similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.link/type rename to main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/type diff --git a/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up new file mode 100644 index 0000000..5814956 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +export OPTS rw,nosuid,nodev,noexec,relatime +export FSTYPE binfmt_misc +s6-envdir -I /etc/s6/env/mount.proc-sys-fs-binfmt_misc + +export DEST /proc/sys/fs/binfmt_misc +/usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.proc/up b/main/nnd-s6-services/rc/mount.proc/up index 72a93c9..fec530a 100644 --- a/main/nnd-s6-services/rc/mount.proc/up +++ b/main/nnd-s6-services/rc/mount.proc/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /proc +export OPTS nosuid,nodev,noexec,hidepid=2 export FSTYPE proc +s6-envdir -I /etc/s6/env/mount.proc -s6-envdir -i /etc/s6/env/mount.proc - +export DEST /proc /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.root/up b/main/nnd-s6-services/rc/mount.root/up index 4799ae8..67e18a7 100644 --- a/main/nnd-s6-services/rc/mount.root/up +++ b/main/nnd-s6-services/rc/mount.root/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +export SRC LABEL=nnd-root +export OPTS rw +export FSTYPE btrfs +s6-envdir -I /etc/s6/env/mount.root + export DEST / - -s6-envdir -i /etc/s6/env/mount.root - /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.run/up b/main/nnd-s6-services/rc/mount.run/up index 4b181f4..61a7697 100644 --- a/main/nnd-s6-services/rc/mount.run/up +++ b/main/nnd-s6-services/rc/mount.run/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /run +export OPTS nodev,nosuid,size=3259832k,nr_inodes=819200,mode=755,inode64 export FSTYPE tmpfs +s6-envdir -I /etc/s6/env/mount.run -s6-envdir -i /etc/s6/env/mount.run - +export DEST /run /usr/libexec/nnd/s6/mount 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 4660d4c..c9d40f9 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 @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /sys/firmware/efi/efivars +export OPTS nosuid,nodev,noexec export FSTYPE efivarfs +s6-envdir -I /etc/s6/env/mount.sys-firmware-efi-efivars -s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars - +export DEST /sys/firmware/efi/efivars /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up index a9d6c9a..4012ca0 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up +++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /sys/fs/cgroup +export rw,nosuid,nodev,noexec,relatime,nsdelegate export FSTYPE cgroup2 +s6-envdir -I /etc/s6/env/mount.sys-fs-cgroup -s6-envdir -i /etc/s6/env/mount.sys-fs-cgroup - +export DEST /sys/fs/cgroup /usr/libexec/nnd/s6/mount 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 892149a..85dd7f6 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up +++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /sys/fs/pstore +export OPTS nosuid,nodev,noexec export FSTYPE pstore +s6-envdir -I /etc/s6/env/mount.sys-fs-pstore -s6-envdir -i /etc/s6/env/mount.sys-fs-pstore - +export DEST /sys/fs/pstore /usr/libexec/nnd/s6/mount 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 e3e4e93..0f06395 100644 --- a/main/nnd-s6-services/rc/mount.sys-kernel-security/up +++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /sys/kernel/security +export OPTS nosuid,nodev,noexec export FSTYPE securityfs +s6-envdir -I /etc/s6/env/mount.sys-kernel-security -s6-envdir -i /etc/s6/env/mount.sys-kernel-security - +export DEST /sys/kernel/security /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys/up b/main/nnd-s6-services/rc/mount.sys/up index 1a9d1b3..6585667 100644 --- a/main/nnd-s6-services/rc/mount.sys/up +++ b/main/nnd-s6-services/rc/mount.sys/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /sys +export OPTS nosuid,nodev,noexec export FSTYPE sysfs +s6-envdir -I /etc/s6/env/mount.sys -s6-envdir -i /etc/s6/env/mount.sys - +export DEST /sys /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.tmp/up b/main/nnd-s6-services/rc/mount.tmp/up index f1111c0..09ed22e 100644 --- a/main/nnd-s6-services/rc/mount.tmp/up +++ b/main/nnd-s6-services/rc/mount.tmp/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -export DEST /tmp +export OPTS nodev,nosuid export FSTYPE tmpfs +s6-envdir -I /etc/s6/env/mount.tmp -s6-envdir -i /etc/s6/env/mount.tmp - +export DEST /tmp /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up index 0520edb..e82971f 100644 --- a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up +++ b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up @@ -1,7 +1,6 @@ #!/bin/execlineb -P -export DEST /var/lib/ceph/osd/ceph-0 export FSTYPE tmpfs - s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0 +export DEST /var/lib/ceph/osd/ceph-0 /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/nftables/up b/main/nnd-s6-services/rc/nftables/up index 8734daa..999aeb1 100644 --- a/main/nnd-s6-services/rc/nftables/up +++ b/main/nnd-s6-services/rc/nftables/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/nftables -importas -i RULESET RULESET -importas -i RULEDIR RULEDIR +s6-envdir -I /etc/s6/env/nftables +importas -D /etc/nnd/nftables/loadall RULESET RULESET +importas -D /etc/nnd/nftables/ RULEDIR RULEDIR s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/ntpd.1/run b/main/nnd-s6-services/rc/ntpd.1/run index 5613ae2..d88e15c 100755 --- a/main/nnd-s6-services/rc/ntpd.1/run +++ b/main/nnd-s6-services/rc/ntpd.1/run @@ -1,6 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/ntpd.1 -importas -i NTPS NTPS +s6-envdir -I /etc/s6/env/ntpd.1 +importas -D 2.pool.ntp.org NTPS NTPS s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/radvd/run b/main/nnd-s6-services/rc/radvd/run index f5ecc22..64b3928 100755 --- a/main/nnd-s6-services/rc/radvd/run +++ b/main/nnd-s6-services/rc/radvd/run @@ -1,6 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/radvd -importas -i CONFIG CONFIG +s6-envdir -I /etc/s6/env/radvd +importas -D /etc/radvd/radvd.conf CONFIG CONFIG s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/sshd.1/run b/main/nnd-s6-services/rc/sshd.1/run index 8312ae3..43bcf68 100755 --- a/main/nnd-s6-services/rc/sshd.1/run +++ b/main/nnd-s6-services/rc/sshd.1/run @@ -1,6 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/sshd.1 -importas -i SSHDCFG SSHDCFG +s6-envdir -I /etc/s6/env/sshd.1 +importas -D /etc/ssh/sshd_config SSHDCFG SSHDCFG s6-envdir -i /etc/s6/env/path emptyenv -p diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up index ce340a1..cb1ea3e 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL 1 +s6-envdir -I /etc/s6/env/sys.kernel-mm-ksm-merge_across_nodes + export SYSPATH kernel/mm/ksm/merge_across_nodes - -s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-merge_across_nodes - /usr/libexec/nnd/s6/sysfs 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 index b91ff55..429a812 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL 1 +s6-envdir -I /etc/s6/env/sys.kernel-mm-ksm-run + export SYSPATH kernel/mm/ksm/run - -s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run - /usr/libexec/nnd/s6/sysfs 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 index 9efc436..f10b30e 100644 --- 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 @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL madvise +s6-envdir -I /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled + export SYSPATH kernel/mm/transparent_hugepage/enabled - -s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled - /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up index 162e89f..e780a5d 100644 --- a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up +++ b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL nnd-localhost +s6-envdir -I /etc/s6/env/sysctl.kernel-hostname + export SYSCTL kernel/hostname - -s6-envdir -i /etc/s6/env/sysctl.kernel-hostname - /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/down b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/down index fb1b3cf..7f697fb 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/down +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/down @@ -1,5 +1,4 @@ #!/bin/execlineb -P -export SYSCTL net/ipv4/tcp_l3mdev_accept export VAL 0 - +export SYSCTL net/ipv4/tcp_l3mdev_accept /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up index 707d9dd..1e7be7c 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up @@ -1,5 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/sysctl.net-ipv4-tcp_l3mdev_accept -export SYSCTL net/ipv4/tcp_l3mdev_accept +export VAL 1 +s6-envdir -I /etc/s6/env/sysctl.net-ipv4-tcp_l3mdev_accept +export SYSCTL net/ipv4/tcp_l3mdev_accept /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/down b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/down index ce3a7db..0233e47 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/down +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/down @@ -1,5 +1,4 @@ #!/bin/execlineb -P -export SYSCTL net/ipv4/udp_l3mdev_accept export VAL 0 - +export SYSCTL net/ipv4/udp_l3mdev_accept /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up index 83fd348..f78ee76 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up @@ -1,5 +1,6 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/sysctl.net-ipv4-udp_l3mdev_accept -export SYSCTL net/ipv4/udp_l3mdev_accept +export VAL 1 +s6-envdir -I /etc/s6/env/sysctl.net-ipv4-udp_l3mdev_accept +export SYSCTL net/ipv4/udp_l3mdev_accept /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/dependencies.d/module.ipv6 similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/dependencies.d/module.ipv6 diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/dependencies.d/mount.proc similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/dependencies.d/mount.proc diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/dependencies.d/sysctl.net-ipv6-conf-default-forwarding similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/dependencies.d/sysctl.net-ipv6-conf-default-forwarding diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/down b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/down new file mode 100644 index 0000000..8280b43 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/down @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +define INTERFACE all +export VAL 0 +export SYSCTL net/ipv6/conf/${INTERFACE}/forwarding +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/type b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/type similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/type rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/type diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up new file mode 100644 index 0000000..8f7f52b --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +define INTERFACE all +export VAL 1 +s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-${INTERFACE}-forwarding + +export SYSCTL net/ipv6/conf/${INTERFACE}/forwarding +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down index 9d9b464..1875495 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/down @@ -1,6 +1,4 @@ #!/bin/execlineb -P -export SYSCTL net/ipv6/conf/all/keep_addr_on_down - export VAL 0 - +export SYSCTL net/ipv6/conf/all/keep_addr_on_down /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up index a0f4bdc..19a5507 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL 1 +s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-all-keep_addr_on_down + export SYSCTL net/ipv6/conf/all/keep_addr_on_down - -s6-envdir -i /etc/s6/env/sysctl.net-ipv6-conf-all-keep_addr_on_down - /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.4 b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/dependencies.d/module.ipv6 similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.4 rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/dependencies.d/module.ipv6 diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.6 b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/dependencies.d/mount.proc similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.6 rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/dependencies.d/mount.proc diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/down b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/down new file mode 100644 index 0000000..fb19b5b --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/down @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +define INTERFACE default +export VAL 0 +export SYSCTL net/ipv6/conf/${INTERFACE}/forwarding +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/type b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/type similarity index 100% rename from main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/type rename to main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/type diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up new file mode 100644 index 0000000..196ad33 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +define INTERFACE default +export VAL 1 +s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-${INTERFACE}-forwarding + +export SYSCTL net/ipv6/conf/${INTERFACE}/forwarding +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down index c7a3c7c..adf7fc8 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/down @@ -1,5 +1,4 @@ #!/bin/execlineb -P -export SYSCTL net/ipv6/conf/default/keep_addr_on_down export VAL 0 - +export SYSCTL net/ipv6/conf/default/keep_addr_on_down /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up index 95d320b..e82a055 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL 1 +s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-default-keep_addr_on_down + export SYSCTL net/ipv6/conf/default/keep_addr_on_down - -s6-envdir -i /etc/s6/env/sysctl.net-ipv6-conf-default-keep_addr_on_down - /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down index 85e09a9..c250de5 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down +++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down @@ -1,5 +1,4 @@ #!/bin/execlineb -P -export SYSCTL vm/nr_hugepages export VAL 0 - +export SYSCTL vm/nr_hugepages /usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up index 00da7bd..7094fb6 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up +++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up @@ -1,6 +1,6 @@ #!/bin/execlineb -P +export VAL 1000 +s6-envdir -I /etc/s6/env/sysctl.vm-nr_hugepages + export SYSCTL vm/nr_hugepages - -s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages - /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/dependencies.d/vrf.vrf-mynet b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/dependencies.d/vrf.vrf-mynet deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/down b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/down deleted file mode 100644 index 30b5dc2..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/down +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE vrf-mynet - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip link set dev $INTERFACE down diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/type b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/up b/main/nnd-s6-services/rc/vrf.vrf-mynet.link/up deleted file mode 100644 index 4b7de04..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet.link/up +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE vrf-mynet - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip link set dev $INTERFACE up diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/dependencies.d/vrf.vrf-mynet b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/dependencies.d/vrf.vrf-mynet deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/down b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/down deleted file mode 100644 index e25ada8..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/down +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE vrf-mynet - -s6-envdir -i /etc/s6/env/vrf.${INTERFACE} -importas -i TABLE TABLE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 route del default dev $INTERFACE table $TABLE diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/type b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/up b/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/up deleted file mode 100644 index 472fb4f..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet.static.route.fallback/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE vrf-mynet - -s6-envdir -i /etc/s6/env/vrf.${INTERFACE} -importas -i TABLE TABLE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 route add unreachable default metric 4278198272 table $TABLE diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-tcp_l3mdev_accept b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-tcp_l3mdev_accept deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-udp_l3mdev_accept b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv4-udp_l3mdev_accept deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv6-conf-all-keep_addr_on_down b/main/nnd-s6-services/rc/vrf.vrf-mynet/dependencies.d/sysctl.net-ipv6-conf-all-keep_addr_on_down deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/down b/main/nnd-s6-services/rc/vrf.vrf-mynet/down deleted file mode 100644 index c343096..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet/down +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE vrf-mynet - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 link del $INTERFACE diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/type b/main/nnd-s6-services/rc/vrf.vrf-mynet/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/vrf.vrf-mynet/up b/main/nnd-s6-services/rc/vrf.vrf-mynet/up deleted file mode 100644 index 5300e7f..0000000 --- a/main/nnd-s6-services/rc/vrf.vrf-mynet/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE vrf-mynet - -s6-envdir -i /etc/s6/env/vrf.${INTERFACE} -importas -i TABLE TABLE - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -ip -6 link add $INTERFACE type vrf table $TABLE diff --git a/main/nnd-s6-services/rc/wg-config.wg-tunnel/dependencies.d/interface.wg-tunnel.create b/main/nnd-s6-services/rc/wg-config.wg-tunnel/dependencies.d/interface.wg-tunnel.create deleted file mode 100644 index e69de29..0000000 diff --git a/main/nnd-s6-services/rc/wg-config.wg-tunnel/type b/main/nnd-s6-services/rc/wg-config.wg-tunnel/type deleted file mode 100644 index bdd22a1..0000000 --- a/main/nnd-s6-services/rc/wg-config.wg-tunnel/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/main/nnd-s6-services/rc/wg-config.wg-tunnel/up b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up deleted file mode 100644 index 55c96ff..0000000 --- a/main/nnd-s6-services/rc/wg-config.wg-tunnel/up +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/execlineb -P -define INTERFACE wg-tunnel - -s6-envdir -i /etc/s6/env/wg-config.${INTERFACE} -importas -i CONFIG CONFIG - -s6-envdir -i /etc/s6/env/path -emptyenv -p - -wg setconf $INTERFACE $CONFIG diff --git a/main/nnd-s6-services/tmpl/mount b/main/nnd-s6-services/tmpl/mount index 7d67c2a..ca5d0e7 100755 --- a/main/nnd-s6-services/tmpl/mount +++ b/main/nnd-s6-services/tmpl/mount @@ -4,13 +4,13 @@ importas -i DEST DEST importas -i FSTYPE FSTYPE importas -D "defaults" OPTS OPTS -s6-envdir -I /etc/s6/env/path +s6-envdir -i /etc/s6/env/path emptyenv -p foreground { mkdir -p $DEST } # Resolve LABEL and UUID -backtick -E -D $SRCPROVIDED SRC { findfs $SRCPROVIDED } +backtick -E -D $SRCPROVIDED SRC { redirfd -w 2 /dev/null findfs $SRCPROVIDED } ifelse { redirfd -w 1 /dev/null findmnt -t $FSTYPE $DEST