diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 183159d..a533055 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.56 -pkgrel=0 +pkgver=2.60 +pkgrel=3 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" builddir="$srcdir/" diff --git a/main/nnd-s6-services/rc/bundle.interface.br0/contents.d/udhcpc.br0 b/main/nnd-s6-services/rc/bundle.binfmt/contents.d/binfmt.qemu-aarch64 similarity index 100% rename from main/nnd-s6-services/rc/bundle.interface.br0/contents.d/udhcpc.br0 rename to main/nnd-s6-services/rc/bundle.binfmt/contents.d/binfmt.qemu-aarch64 diff --git a/main/nnd-s6-services/rc/bundle.binfmt/type b/main/nnd-s6-services/rc/bundle.binfmt/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.binfmt/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/interface.eth0.create/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.dev-tty-legacy_tiocsti similarity index 100% rename from main/nnd-s6-services/rc/interface.eth0.create/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.dev-tty-legacy_tiocsti diff --git a/main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/interface.br0.create b/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.kernel-hostname similarity index 100% rename from main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/interface.br0.create rename to main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.kernel-hostname diff --git a/main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/syslogd b/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.net-ipv4-ip_unprivileged_port_start similarity index 100% rename from main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/syslogd rename to main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.net-ipv4-ip_unprivileged_port_start diff --git a/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.vm-overcommit_memory b/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.vm-overcommit_memory new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.vm-overcommit_ratio b/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.vm-overcommit_ratio new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.vm-swappiness b/main/nnd-s6-services/rc/bundle.sysctl/contents.d/sysctl.vm-swappiness new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.sysctl/type b/main/nnd-s6-services/rc/bundle.sysctl/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.sysctl/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/dbus/dependencies.d/dir.run-dbus b/main/nnd-s6-services/rc/dbus/dependencies.d/dir.run-dbus new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/dbus/dependencies.d/mount.dev b/main/nnd-s6-services/rc/dbus/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/dbus/producer-for b/main/nnd-s6-services/rc/dbus/producer-for new file mode 100644 index 0000000..50e4ddf --- /dev/null +++ b/main/nnd-s6-services/rc/dbus/producer-for @@ -0,0 +1 @@ +logger.dbus diff --git a/main/nnd-s6-services/rc/dbus/run b/main/nnd-s6-services/rc/dbus/run new file mode 100755 index 0000000..b93bf2b --- /dev/null +++ b/main/nnd-s6-services/rc/dbus/run @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +emptyenv -p + +fdmove -c 2 1 + +dbus-daemon --system --nopidfile --nosyslog --nofork diff --git a/main/nnd-s6-services/rc/udhcpc.br0/type b/main/nnd-s6-services/rc/dbus/type similarity index 100% rename from main/nnd-s6-services/rc/udhcpc.br0/type rename to main/nnd-s6-services/rc/dbus/type diff --git a/main/nnd-s6-services/rc/dir.run-dbus/dependencies.d/mount.run b/main/nnd-s6-services/rc/dir.run-dbus/dependencies.d/mount.run new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/dir.run-dbus/type b/main/nnd-s6-services/rc/dir.run-dbus/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/dir.run-dbus/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/dir.run-dbus/up b/main/nnd-s6-services/rc/dir.run-dbus/up new file mode 100644 index 0000000..854fda2 --- /dev/null +++ b/main/nnd-s6-services/rc/dir.run-dbus/up @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export DIR /run/dbus + +/usr/libexec/nnd/s6/dir diff --git a/main/nnd-s6-services/rc/group.seat/dependencies.d/mount.dev b/main/nnd-s6-services/rc/group.seat/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/group.seat/dependencies.d/mount.root b/main/nnd-s6-services/rc/group.seat/dependencies.d/mount.root new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/group.seat/type b/main/nnd-s6-services/rc/group.seat/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/group.seat/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/group.seat/up b/main/nnd-s6-services/rc/group.seat/up new file mode 100644 index 0000000..a17332c --- /dev/null +++ b/main/nnd-s6-services/rc/group.seat/up @@ -0,0 +1,14 @@ +#!/bin/execlineb -P +define GROUP seat + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ifelse -n { + # Silence output + redirfd -w 1 /dev/null + fdmove -c 2 1 + id -g $GROUP +} { + addgroup $GROUP +} true diff --git a/main/nnd-s6-services/rc/udhcpc.br0/producer-for b/main/nnd-s6-services/rc/interface.br0.dhcp/producer-for similarity index 100% rename from main/nnd-s6-services/rc/udhcpc.br0/producer-for rename to main/nnd-s6-services/rc/interface.br0.dhcp/producer-for diff --git a/main/nnd-s6-services/rc/interface.eth0.create/dependencies.d/bundle.hw-coldplug b/main/nnd-s6-services/rc/interface.eth0.create/dependencies.d/bundle.hw-coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/irqbalance/producer-for b/main/nnd-s6-services/rc/irqbalance/producer-for new file mode 100644 index 0000000..608d3f3 --- /dev/null +++ b/main/nnd-s6-services/rc/irqbalance/producer-for @@ -0,0 +1 @@ +logger.irqbalance diff --git a/main/nnd-s6-services/rc/irqbalance/run b/main/nnd-s6-services/rc/irqbalance/run new file mode 100755 index 0000000..0ef816b --- /dev/null +++ b/main/nnd-s6-services/rc/irqbalance/run @@ -0,0 +1,10 @@ +#!/bin/execlineb -P +s6-envdir -I /etc/s6/env/irqbalance +importas -D 10 INTERVAL INTERVAL + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +fdmove -c 2 1 + +irqbalance -fd -t $INTERVAL diff --git a/main/nnd-s6-services/rc/irqbalance/type b/main/nnd-s6-services/rc/irqbalance/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/irqbalance/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.dbus/consumer-for b/main/nnd-s6-services/rc/logger.dbus/consumer-for new file mode 100644 index 0000000..e2182f1 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dbus/consumer-for @@ -0,0 +1 @@ +dbus diff --git a/main/nnd-s6-services/rc/logger.dbus/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.dbus/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.dbus/notification-fd b/main/nnd-s6-services/rc/logger.dbus/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dbus/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.dbus/run b/main/nnd-s6-services/rc/logger.dbus/run new file mode 100755 index 0000000..c18eb13 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dbus/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME dbus + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.dbus/type b/main/nnd-s6-services/rc/logger.dbus/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dbus/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.irqbalance/consumer-for b/main/nnd-s6-services/rc/logger.irqbalance/consumer-for new file mode 100644 index 0000000..77617c0 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.irqbalance/consumer-for @@ -0,0 +1 @@ +irqbalance diff --git a/main/nnd-s6-services/rc/logger.irqbalance/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.irqbalance/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.irqbalance/notification-fd b/main/nnd-s6-services/rc/logger.irqbalance/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.irqbalance/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.irqbalance/run b/main/nnd-s6-services/rc/logger.irqbalance/run new file mode 100755 index 0000000..5ee8bc3 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.irqbalance/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME irqbalance + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.irqbalance/type b/main/nnd-s6-services/rc/logger.irqbalance/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.irqbalance/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.prometheus-node-exporter/consumer-for b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/consumer-for new file mode 100644 index 0000000..e672598 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/consumer-for @@ -0,0 +1 @@ +prometheus-node-exporter diff --git a/main/nnd-s6-services/rc/logger.prometheus-node-exporter/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.prometheus-node-exporter/notification-fd b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.prometheus-node-exporter/run b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/run new file mode 100755 index 0000000..a9e80c5 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME prometheus-node-exporter + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.prometheus-node-exporter/type b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.prometheus-node-exporter/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.seatd/consumer-for b/main/nnd-s6-services/rc/logger.seatd/consumer-for new file mode 100644 index 0000000..fd6b59e --- /dev/null +++ b/main/nnd-s6-services/rc/logger.seatd/consumer-for @@ -0,0 +1 @@ +seatd diff --git a/main/nnd-s6-services/rc/logger.seatd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.seatd/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.seatd/notification-fd b/main/nnd-s6-services/rc/logger.seatd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.seatd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.seatd/run b/main/nnd-s6-services/rc/logger.seatd/run new file mode 100755 index 0000000..6acb20e --- /dev/null +++ b/main/nnd-s6-services/rc/logger.seatd/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME seatd + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.seatd/type b/main/nnd-s6-services/rc/logger.seatd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.seatd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.udhcpc/consumer-for b/main/nnd-s6-services/rc/logger.udhcpc/consumer-for index 1f65733..ec303bb 100644 --- a/main/nnd-s6-services/rc/logger.udhcpc/consumer-for +++ b/main/nnd-s6-services/rc/logger.udhcpc/consumer-for @@ -1 +1 @@ -udhcpc.br0 +interface.br0.dhcp diff --git a/main/nnd-s6-services/rc/prometheus-node-exporter/producer-for b/main/nnd-s6-services/rc/prometheus-node-exporter/producer-for new file mode 100644 index 0000000..abd79d0 --- /dev/null +++ b/main/nnd-s6-services/rc/prometheus-node-exporter/producer-for @@ -0,0 +1 @@ +logger.prometheus-node-exporter diff --git a/main/nnd-s6-services/rc/prometheus-node-exporter/run b/main/nnd-s6-services/rc/prometheus-node-exporter/run new file mode 100755 index 0000000..fd46104 --- /dev/null +++ b/main/nnd-s6-services/rc/prometheus-node-exporter/run @@ -0,0 +1,7 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +emptyenv -p + +fdmove -c 2 1 + +node_exporter --web.listen-address=:9100 --collector.tcpstat --collector.processes --collector.mountstats diff --git a/main/nnd-s6-services/rc/prometheus-node-exporter/type b/main/nnd-s6-services/rc/prometheus-node-exporter/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/prometheus-node-exporter/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/seatd/dependencies.d/group.seat b/main/nnd-s6-services/rc/seatd/dependencies.d/group.seat new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/seatd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/seatd/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/seatd/dependencies.d/user.seat b/main/nnd-s6-services/rc/seatd/dependencies.d/user.seat new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/seatd/notification-fd b/main/nnd-s6-services/rc/seatd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/seatd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/seatd/producer-for b/main/nnd-s6-services/rc/seatd/producer-for new file mode 100644 index 0000000..19cdbc8 --- /dev/null +++ b/main/nnd-s6-services/rc/seatd/producer-for @@ -0,0 +1 @@ +logger.seatd diff --git a/main/nnd-s6-services/rc/udhcpc.br0/run b/main/nnd-s6-services/rc/seatd/run similarity index 61% rename from main/nnd-s6-services/rc/udhcpc.br0/run rename to main/nnd-s6-services/rc/seatd/run index eb3c035..b0c8667 100755 --- a/main/nnd-s6-services/rc/udhcpc.br0/run +++ b/main/nnd-s6-services/rc/seatd/run @@ -1,9 +1,7 @@ #!/bin/execlineb -P -define INTERFACE br0 - s6-envdir -i /etc/s6/env/path emptyenv -p fdmove -c 2 1 -udhcpc -i $INTERFACE -f -S +seatd -n 3 -u seat -g seat diff --git a/main/nnd-s6-services/rc/seatd/type b/main/nnd-s6-services/rc/seatd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/seatd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/down b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/down new file mode 100644 index 0000000..a90448e --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/down @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export VAL 0 +export SYSCTL dev/tty/legacy_tiocsti +/usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/type b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up new file mode 100644 index 0000000..06bd7fb --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export VAL 0 +s6-envdir -I /etc/s6/env/sysctl.dev-tty-legacy_tiocsti + +export SYSCTL dev/tty/legacy_tiocsti +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/down b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/down new file mode 100644 index 0000000..2311e6a --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/down @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export VAL 0 +export SYSCTL net/ipv4/ip_unprivileged_port_start +/usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/type b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up new file mode 100644 index 0000000..312409b --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export VAL 0 +s6-envdir -I /etc/s6/env/sysctl.net-ipv4-ip_unprivileged_port_start + +export SYSCTL net/ipv4/ip_unprivileged_port_start +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/down b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/down new file mode 100644 index 0000000..1222adf --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/down @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export VAL 0 +export SYSCTL vm/overcommit_memory +/usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/type b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up new file mode 100644 index 0000000..77e2f2d --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export VAL 2 +s6-envdir -I /etc/s6/env/sysctl.vm-overcommit_memory + +export SYSCTL vm/overcommit_memory +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/down b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/down new file mode 100644 index 0000000..6946129 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/down @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export VAL 0 +export SYSCTL vm/overcommit_ratio +/usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/type b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up new file mode 100644 index 0000000..aaf9b4e --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +export VAL 95 +s6-envdir -I /etc/s6/env/sysctl.vm-overcommit_ratio + +export SYSCTL vm/overcommit_ratio +/usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/user.seat/dependencies.d/mount.dev b/main/nnd-s6-services/rc/user.seat/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/user.seat/dependencies.d/mount.root b/main/nnd-s6-services/rc/user.seat/dependencies.d/mount.root new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/user.seat/type b/main/nnd-s6-services/rc/user.seat/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/user.seat/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/user.seat/up b/main/nnd-s6-services/rc/user.seat/up new file mode 100644 index 0000000..ae4bcfa --- /dev/null +++ b/main/nnd-s6-services/rc/user.seat/up @@ -0,0 +1,15 @@ +#!/bin/execlineb -P +define SHELL /sbin/nologin +define USER seat + +s6-envdir -i /etc/s6/env/path +emptyenv -p + +ifelse -n { + # Silence output + redirfd -w 1 /dev/null + fdmove -c 2 1 + id -u $USER +} { + adduser -s $SHELL -H -D $USER +} true diff --git a/main/nnd-s6-services/rc/user.sshd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/user.sshd/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/user.sshd/up b/main/nnd-s6-services/rc/user.sshd/up index 9f1c948..4ae6930 100644 --- a/main/nnd-s6-services/rc/user.sshd/up +++ b/main/nnd-s6-services/rc/user.sshd/up @@ -5,9 +5,11 @@ define USER sshd s6-envdir -i /etc/s6/env/path emptyenv -p -# TODO: Handle user already being present -foreground { +ifelse -n { + # Silence output + fdmove -c 2 1 + redirfd -w 1 /dev/null + id -u $USER +} { adduser -s $SHELL -H -D $USER -} if -nt { - importas status ? test $status -eq 1 -} +} true