diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index baaf99e..26dda28 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -1,22 +1,15 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=nnd-s6-services -pkgver=0.48 +pkgver=1.4 pkgrel=0 pkgdesc="Base services for s6" url="none" arch="noarch" license="MIT" depends="s6-rc s6-portable-utils s6-linux-utils" -subpackages=" - $pkgname-core:_bundle - $pkgname-net:_bundle - $pkgname-desktop:_bundle - $pkgname-libvirt:_bundle - $pkgname-virtual:_bundle - $pkgname-tunnel:_bundle -" builddir="$srcdir/" +_distpfx="etc/s6/dist" prepare() { default_prepare @@ -26,21 +19,30 @@ prepare() { } package() { - mkdir -p "$pkgdir"/etc/s6/sv - mv "$builddir"/rc "$pkgdir"/etc/s6/rc - mv "$builddir"/env "$pkgdir"/etc/s6/env + # Distributed bundles + mkdir -p "$pkgdir/$_distpfx" + mv "$builddir"/rc "$pkgdir/$_distpfx"/rc + mv "$builddir"/env "$pkgdir/$_distpfx"/env + + # Manager install -Dm755 "$builddir"/manage.sh "$pkgdir"/usr/bin/nnd-s6 - mkdir -p "$pkgdir"/etc/s6/rc/custom # User scripts, no distributed bundles - mkdir -p "$pkgdir"/etc/s6/rc/custom/default/contents.d - echo bundle > "$pkgdir"/etc/s6/rc/custom/default/type + + # Defaults + mkdir -p "$pkgdir"/etc/s6/sv + + mkdir -p "$pkgdir"/etc/s6/env + + mkdir -p "$pkgdir"/etc/s6/rc + mkdir -p "$pkgdir"/etc/s6/rc/default/contents.d + echo bundle > "$pkgdir"/etc/s6/rc/default/type } check() { - s6-rc-compile "$builddir"/compiled "$builddir"/rc/* + s6-rc-compile "$builddir"/compiled "$builddir"/rc } _bundle() { local _BNAME="${subpkgname##$pkgname-}" - [ -d "$pkgdir/etc/s6/env/$_BNAME" ] && amove "etc/s6/env/$_BNAME" - amove "etc/s6/rc/$_BNAME" + [ -d "$pkgdir/$_distpfx/env/$_BNAME" ] && amove "$_distpfx/env/$_BNAME" + amove "$_distpfx/rc/$_BNAME" } diff --git a/main/nnd-s6-services/env/core/getty.tty1/BAUD b/main/nnd-s6-services/env/getty.tty1/BAUD similarity index 100% rename from main/nnd-s6-services/env/core/getty.tty1/BAUD rename to main/nnd-s6-services/env/getty.tty1/BAUD diff --git a/main/nnd-s6-services/env/core/hostname/HOSTNAME b/main/nnd-s6-services/env/hostname/HOSTNAME similarity index 100% rename from main/nnd-s6-services/env/core/hostname/HOSTNAME rename to main/nnd-s6-services/env/hostname/HOSTNAME diff --git a/main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.addr.4/ADDR b/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.4/ADDR similarity index 100% rename from main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.addr.4/ADDR rename to main/nnd-s6-services/env/interface.wg-tunnel.static.addr.4/ADDR diff --git a/main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.addr.6/ADDR b/main/nnd-s6-services/env/interface.wg-tunnel.static.addr.6/ADDR similarity index 100% rename from main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.addr.6/ADDR rename to main/nnd-s6-services/env/interface.wg-tunnel.static.addr.6/ADDR diff --git a/main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.route.4/ROUTE b/main/nnd-s6-services/env/interface.wg-tunnel.static.route.4/ROUTE similarity index 100% rename from main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.route.4/ROUTE rename to main/nnd-s6-services/env/interface.wg-tunnel.static.route.4/ROUTE diff --git a/main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.route.6/ROUTE b/main/nnd-s6-services/env/interface.wg-tunnel.static.route.6/ROUTE similarity index 100% rename from main/nnd-s6-services/env/tunnel/interface.wg-tunnel.static.route.6/ROUTE rename to main/nnd-s6-services/env/interface.wg-tunnel.static.route.6/ROUTE diff --git a/main/nnd-s6-services/env/core/logger.klogd/LOGARCHIVES b/main/nnd-s6-services/env/logger.klogd/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/core/logger.klogd/LOGARCHIVES rename to main/nnd-s6-services/env/logger.klogd/LOGARCHIVES diff --git a/main/nnd-s6-services/env/core/logger.klogd/LOGSIZE b/main/nnd-s6-services/env/logger.klogd/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/core/logger.klogd/LOGSIZE rename to main/nnd-s6-services/env/logger.klogd/LOGSIZE diff --git a/main/nnd-s6-services/env/core/logger.mdevd/LOGARCHIVES b/main/nnd-s6-services/env/logger.mdevd/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/core/logger.mdevd/LOGARCHIVES rename to main/nnd-s6-services/env/logger.mdevd/LOGARCHIVES diff --git a/main/nnd-s6-services/env/core/logger.mdevd/LOGSIZE b/main/nnd-s6-services/env/logger.mdevd/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/core/logger.mdevd/LOGSIZE rename to main/nnd-s6-services/env/logger.mdevd/LOGSIZE diff --git a/main/nnd-s6-services/env/core/logger.syslogd/LOGARCHIVES b/main/nnd-s6-services/env/logger.ntpd/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/core/logger.syslogd/LOGARCHIVES rename to main/nnd-s6-services/env/logger.ntpd/LOGARCHIVES diff --git a/main/nnd-s6-services/env/core/logger.syslogd/LOGSIZE b/main/nnd-s6-services/env/logger.ntpd/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/core/logger.syslogd/LOGSIZE rename to main/nnd-s6-services/env/logger.ntpd/LOGSIZE diff --git a/main/nnd-s6-services/env/net/logger.ntpd/LOGARCHIVES b/main/nnd-s6-services/env/logger.qemu-ga/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/net/logger.ntpd/LOGARCHIVES rename to main/nnd-s6-services/env/logger.qemu-ga/LOGARCHIVES diff --git a/main/nnd-s6-services/env/net/logger.ntpd/LOGSIZE b/main/nnd-s6-services/env/logger.qemu-ga/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/net/logger.ntpd/LOGSIZE rename to main/nnd-s6-services/env/logger.qemu-ga/LOGSIZE diff --git a/main/nnd-s6-services/env/net/logger.sshd/LOGARCHIVES b/main/nnd-s6-services/env/logger.sshd/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/net/logger.sshd/LOGARCHIVES rename to main/nnd-s6-services/env/logger.sshd/LOGARCHIVES diff --git a/main/nnd-s6-services/env/net/logger.sshd/LOGSIZE b/main/nnd-s6-services/env/logger.sshd/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/net/logger.sshd/LOGSIZE rename to main/nnd-s6-services/env/logger.sshd/LOGSIZE diff --git a/main/nnd-s6-services/env/net/logger.udhcpc/LOGARCHIVES b/main/nnd-s6-services/env/logger.syslogd/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/net/logger.udhcpc/LOGARCHIVES rename to main/nnd-s6-services/env/logger.syslogd/LOGARCHIVES diff --git a/main/nnd-s6-services/env/net/logger.udhcpc/LOGSIZE b/main/nnd-s6-services/env/logger.syslogd/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/net/logger.udhcpc/LOGSIZE rename to main/nnd-s6-services/env/logger.syslogd/LOGSIZE diff --git a/main/nnd-s6-services/env/virtual/logger.qemu-ga/LOGARCHIVES b/main/nnd-s6-services/env/logger.udhcpc/LOGARCHIVES similarity index 100% rename from main/nnd-s6-services/env/virtual/logger.qemu-ga/LOGARCHIVES rename to main/nnd-s6-services/env/logger.udhcpc/LOGARCHIVES diff --git a/main/nnd-s6-services/env/virtual/logger.qemu-ga/LOGSIZE b/main/nnd-s6-services/env/logger.udhcpc/LOGSIZE similarity index 100% rename from main/nnd-s6-services/env/virtual/logger.qemu-ga/LOGSIZE rename to main/nnd-s6-services/env/logger.udhcpc/LOGSIZE diff --git a/main/nnd-s6-services/env/core/mount.boot-efi/FSTYPE b/main/nnd-s6-services/env/mount.boot-efi/FSTYPE similarity index 100% rename from main/nnd-s6-services/env/core/mount.boot-efi/FSTYPE rename to main/nnd-s6-services/env/mount.boot-efi/FSTYPE diff --git a/main/nnd-s6-services/env/core/mount.boot-efi/OPTS b/main/nnd-s6-services/env/mount.boot-efi/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.boot-efi/OPTS rename to main/nnd-s6-services/env/mount.boot-efi/OPTS diff --git a/main/nnd-s6-services/env/core/mount.boot-efi/SRC b/main/nnd-s6-services/env/mount.boot-efi/SRC similarity index 100% rename from main/nnd-s6-services/env/core/mount.boot-efi/SRC rename to main/nnd-s6-services/env/mount.boot-efi/SRC diff --git a/main/nnd-s6-services/env/core/mount.boot/FSTYPE b/main/nnd-s6-services/env/mount.boot/FSTYPE similarity index 100% rename from main/nnd-s6-services/env/core/mount.boot/FSTYPE rename to main/nnd-s6-services/env/mount.boot/FSTYPE diff --git a/main/nnd-s6-services/env/core/mount.boot/OPTS b/main/nnd-s6-services/env/mount.boot/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.boot/OPTS rename to main/nnd-s6-services/env/mount.boot/OPTS diff --git a/main/nnd-s6-services/env/core/mount.boot/SRC b/main/nnd-s6-services/env/mount.boot/SRC similarity index 100% rename from main/nnd-s6-services/env/core/mount.boot/SRC rename to main/nnd-s6-services/env/mount.boot/SRC diff --git a/main/nnd-s6-services/env/core/mount.dev-mqueue/OPTS b/main/nnd-s6-services/env/mount.dev-mqueue/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.dev-mqueue/OPTS rename to main/nnd-s6-services/env/mount.dev-mqueue/OPTS diff --git a/main/nnd-s6-services/env/core/mount.dev-pts/OPTS b/main/nnd-s6-services/env/mount.dev-pts/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.dev-pts/OPTS rename to main/nnd-s6-services/env/mount.dev-pts/OPTS diff --git a/main/nnd-s6-services/env/core/mount.dev-shm/OPTS b/main/nnd-s6-services/env/mount.dev-shm/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.dev-shm/OPTS rename to main/nnd-s6-services/env/mount.dev-shm/OPTS diff --git a/main/nnd-s6-services/env/core/mount.dev/OPTS b/main/nnd-s6-services/env/mount.dev/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.dev/OPTS rename to main/nnd-s6-services/env/mount.dev/OPTS diff --git a/main/nnd-s6-services/env/core/mount.proc/OPTS b/main/nnd-s6-services/env/mount.proc/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.proc/OPTS rename to main/nnd-s6-services/env/mount.proc/OPTS diff --git a/main/nnd-s6-services/env/core/mount.root/FSTYPE b/main/nnd-s6-services/env/mount.root/FSTYPE similarity index 100% rename from main/nnd-s6-services/env/core/mount.root/FSTYPE rename to main/nnd-s6-services/env/mount.root/FSTYPE diff --git a/main/nnd-s6-services/env/core/mount.root/OPTS b/main/nnd-s6-services/env/mount.root/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.root/OPTS rename to main/nnd-s6-services/env/mount.root/OPTS diff --git a/main/nnd-s6-services/env/core/mount.root/SRC b/main/nnd-s6-services/env/mount.root/SRC similarity index 100% rename from main/nnd-s6-services/env/core/mount.root/SRC rename to main/nnd-s6-services/env/mount.root/SRC diff --git a/main/nnd-s6-services/env/core/mount.run/OPTS b/main/nnd-s6-services/env/mount.run/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.run/OPTS rename to main/nnd-s6-services/env/mount.run/OPTS diff --git a/main/nnd-s6-services/env/core/mount.sys-firmware-efi-efivars/OPTS b/main/nnd-s6-services/env/mount.sys-firmware-efi-efivars/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.sys-firmware-efi-efivars/OPTS rename to main/nnd-s6-services/env/mount.sys-firmware-efi-efivars/OPTS diff --git a/main/nnd-s6-services/env/core/mount.sys-fs-pstore/OPTS b/main/nnd-s6-services/env/mount.sys-fs-pstore/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.sys-fs-pstore/OPTS rename to main/nnd-s6-services/env/mount.sys-fs-pstore/OPTS diff --git a/main/nnd-s6-services/env/core/mount.sys-kernel-security/OPTS b/main/nnd-s6-services/env/mount.sys-kernel-security/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.sys-kernel-security/OPTS rename to main/nnd-s6-services/env/mount.sys-kernel-security/OPTS diff --git a/main/nnd-s6-services/env/core/mount.sys/OPTS b/main/nnd-s6-services/env/mount.sys/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.sys/OPTS rename to main/nnd-s6-services/env/mount.sys/OPTS diff --git a/main/nnd-s6-services/env/core/mount.tmp/OPTS b/main/nnd-s6-services/env/mount.tmp/OPTS similarity index 100% rename from main/nnd-s6-services/env/core/mount.tmp/OPTS rename to main/nnd-s6-services/env/mount.tmp/OPTS diff --git a/main/nnd-s6-services/env/tunnel/wg-config.wg-tunnel/CONFIG b/main/nnd-s6-services/env/wg-config.wg-tunnel/CONFIG similarity index 100% rename from main/nnd-s6-services/env/tunnel/wg-config.wg-tunnel/CONFIG rename to main/nnd-s6-services/env/wg-config.wg-tunnel/CONFIG diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh index 002679d..0c29758 100755 --- a/main/nnd-s6-services/manage.sh +++ b/main/nnd-s6-services/manage.sh @@ -13,7 +13,9 @@ alt_ab() { } : ${S6_PATH:='/etc/s6'} +: ${S6_DIST_PATH:="$S6_PATH/dist"} : ${S6_RC_PATH:="$S6_PATH/rc"} +: ${S6_ENV_PATH:="$S6_PATH/env"} : ${S6_SV_PATH:="$S6_PATH/sv"} # A/B mode, always keep last copy @@ -32,7 +34,7 @@ generate() { if [ -d "$S6_SV_PATH/current.$DB_FRESH_NAC" ]; then rm -rf "$S6_SV_PATH/current.$DB_FRESH_NAC" || ERR="$?" error "Failed to remove inactive database path" fi - s6-rc-compile "$S6_SV_PATH/current.$DB_FRESH_NAC" "$S6_RC_PATH"/* || ERR="$?" error "Failed to compile current s6 database" + s6-rc-compile "$S6_SV_PATH/current.$DB_FRESH_NAC" "$S6_RC_PATH" || ERR="$?" error "Failed to compile current s6 database" } update() { @@ -47,10 +49,27 @@ swap() { fi } +dist() { + SDIR="$S6_DIST_PATH/rc" DPATH="$S6_RC_PATH" distdefs + SDIR="$S6_DIST_PATH/env" DPATH="$S6_ENV_PATH" distdefs +} + +distdefs() { + [ -z "$SDIR" ] && error "SDIR not defined" + [ -z "$DPATH" ] && error "DPATH not defined" + for cdir in "$SDIR"/*; do + local srv="${cdir##*/}" + local dsv="$DPATH/$srv" + if [ ! -d "$dsv" ]; then + ln -sv "$cdir" "$dsv" || ERR="$?" error "Failed to create reference" + fi + done +} + for act in $@; do cstate case "$act" in - generate|update|swap) eval "$act";; + generate|update|swap|dist) eval "$act" || return;; *) error "Invalid action $act";; esac done diff --git a/main/nnd-s6-services/rc/net/bridge.br0.eth0/dependencies.d/interface.br0.link b/main/nnd-s6-services/rc/bridge.br0.eth0/dependencies.d/interface.br0.link similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0.eth0/dependencies.d/interface.br0.link rename to main/nnd-s6-services/rc/bridge.br0.eth0/dependencies.d/interface.br0.link diff --git a/main/nnd-s6-services/rc/net/bridge.br0.eth0/dependencies.d/interface.eth0.link b/main/nnd-s6-services/rc/bridge.br0.eth0/dependencies.d/interface.eth0.link similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0.eth0/dependencies.d/interface.eth0.link rename to main/nnd-s6-services/rc/bridge.br0.eth0/dependencies.d/interface.eth0.link diff --git a/main/nnd-s6-services/rc/net/bridge.br0.eth0/down b/main/nnd-s6-services/rc/bridge.br0.eth0/down similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0.eth0/down rename to main/nnd-s6-services/rc/bridge.br0.eth0/down diff --git a/main/nnd-s6-services/rc/core/clock.hw/type b/main/nnd-s6-services/rc/bridge.br0.eth0/type similarity index 100% rename from main/nnd-s6-services/rc/core/clock.hw/type rename to main/nnd-s6-services/rc/bridge.br0.eth0/type diff --git a/main/nnd-s6-services/rc/net/bridge.br0.eth0/up b/main/nnd-s6-services/rc/bridge.br0.eth0/up similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0.eth0/up rename to main/nnd-s6-services/rc/bridge.br0.eth0/up diff --git a/main/nnd-s6-services/rc/net/bridge.br0/dependencies.d/module.bridge b/main/nnd-s6-services/rc/bridge.br0/dependencies.d/module.bridge similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0/dependencies.d/module.bridge rename to main/nnd-s6-services/rc/bridge.br0/dependencies.d/module.bridge diff --git a/main/nnd-s6-services/rc/net/bridge.br0/down b/main/nnd-s6-services/rc/bridge.br0/down similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0/down rename to main/nnd-s6-services/rc/bridge.br0/down diff --git a/main/nnd-s6-services/rc/core/dir.var-log/type b/main/nnd-s6-services/rc/bridge.br0/type similarity index 100% rename from main/nnd-s6-services/rc/core/dir.var-log/type rename to main/nnd-s6-services/rc/bridge.br0/type diff --git a/main/nnd-s6-services/rc/net/bridge.br0/up b/main/nnd-s6-services/rc/bridge.br0/up similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0/up rename to main/nnd-s6-services/rc/bridge.br0/up diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/clock.hw b/main/nnd-s6-services/rc/bundle.core/contents.d/clock.hw similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/clock.hw rename to main/nnd-s6-services/rc/bundle.core/contents.d/clock.hw diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/getty.tty1 b/main/nnd-s6-services/rc/bundle.core/contents.d/getty.tty1 similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/getty.tty1 rename to main/nnd-s6-services/rc/bundle.core/contents.d/getty.tty1 diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/hostname b/main/nnd-s6-services/rc/bundle.core/contents.d/hostname similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/hostname rename to main/nnd-s6-services/rc/bundle.core/contents.d/hostname diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/klogd b/main/nnd-s6-services/rc/bundle.core/contents.d/klogd similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/klogd rename to main/nnd-s6-services/rc/bundle.core/contents.d/klogd diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mdevd b/main/nnd-s6-services/rc/bundle.core/contents.d/mdevd similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mdevd rename to main/nnd-s6-services/rc/bundle.core/contents.d/mdevd diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mdevd.coldplug b/main/nnd-s6-services/rc/bundle.core/contents.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mdevd.coldplug rename to main/nnd-s6-services/rc/bundle.core/contents.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/module.dm-mod b/main/nnd-s6-services/rc/bundle.core/contents.d/module.dm-mod similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/module.dm-mod rename to main/nnd-s6-services/rc/bundle.core/contents.d/module.dm-mod diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev-mqueue b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev-mqueue similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev-mqueue rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev-mqueue diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev-pts b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev-pts similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev-pts rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev-pts diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev-shm b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev-shm similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.dev-shm rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.dev-shm diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.proc b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.proc similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.proc rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.proc diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.root b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.root rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.root diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.sys b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.sys rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.sys diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.tmp b/main/nnd-s6-services/rc/bundle.core/contents.d/mount.tmp similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/mount.tmp rename to main/nnd-s6-services/rc/bundle.core/contents.d/mount.tmp diff --git a/main/nnd-s6-services/rc/core/bundle.core/contents.d/syslogd b/main/nnd-s6-services/rc/bundle.core/contents.d/syslogd similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/contents.d/syslogd rename to main/nnd-s6-services/rc/bundle.core/contents.d/syslogd diff --git a/main/nnd-s6-services/rc/core/bundle.core/type b/main/nnd-s6-services/rc/bundle.core/type similarity index 100% rename from main/nnd-s6-services/rc/core/bundle.core/type rename to main/nnd-s6-services/rc/bundle.core/type diff --git a/main/nnd-s6-services/rc/desktop/bundle.desktop/contents.d/bundle.graphical.0 b/main/nnd-s6-services/rc/bundle.desktop/contents.d/bundle.graphical.0 similarity index 100% rename from main/nnd-s6-services/rc/desktop/bundle.desktop/contents.d/bundle.graphical.0 rename to main/nnd-s6-services/rc/bundle.desktop/contents.d/bundle.graphical.0 diff --git a/main/nnd-s6-services/rc/desktop/bundle.desktop/type b/main/nnd-s6-services/rc/bundle.desktop/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/bundle.desktop/type rename to main/nnd-s6-services/rc/bundle.desktop/type diff --git a/main/nnd-s6-services/rc/desktop/bundle.graphical.0/contents.d/dwm.0 b/main/nnd-s6-services/rc/bundle.graphical.0/contents.d/dwm.0 similarity index 100% rename from main/nnd-s6-services/rc/desktop/bundle.graphical.0/contents.d/dwm.0 rename to main/nnd-s6-services/rc/bundle.graphical.0/contents.d/dwm.0 diff --git a/main/nnd-s6-services/rc/desktop/bundle.graphical.0/type b/main/nnd-s6-services/rc/bundle.graphical.0/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/bundle.graphical.0/type rename to main/nnd-s6-services/rc/bundle.graphical.0/type diff --git a/main/nnd-s6-services/rc/net/bundle.interface.br0/contents.d/bridge.br0.eth0 b/main/nnd-s6-services/rc/bundle.interface.br0/contents.d/bridge.br0.eth0 similarity index 100% rename from main/nnd-s6-services/rc/net/bundle.interface.br0/contents.d/bridge.br0.eth0 rename to main/nnd-s6-services/rc/bundle.interface.br0/contents.d/bridge.br0.eth0 diff --git a/main/nnd-s6-services/rc/net/bundle.interface.br0/contents.d/udhcpc.br0 b/main/nnd-s6-services/rc/bundle.interface.br0/contents.d/udhcpc.br0 similarity index 100% rename from main/nnd-s6-services/rc/net/bundle.interface.br0/contents.d/udhcpc.br0 rename to main/nnd-s6-services/rc/bundle.interface.br0/contents.d/udhcpc.br0 diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/type b/main/nnd-s6-services/rc/bundle.interface.br0/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/type rename to main/nnd-s6-services/rc/bundle.interface.br0/type diff --git a/main/nnd-s6-services/rc/tunnel/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.link similarity index 100% rename from main/nnd-s6-services/rc/tunnel/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.link diff --git a/main/nnd-s6-services/rc/tunnel/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.static b/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.static similarity index 100% rename from main/nnd-s6-services/rc/tunnel/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.static rename to main/nnd-s6-services/rc/bundle.interface.wg-tunnel/contents.d/interface.wg-tunnel.static diff --git a/main/nnd-s6-services/rc/net/bundle.interface.br0/type b/main/nnd-s6-services/rc/bundle.interface.wg-tunnel/type similarity index 100% rename from main/nnd-s6-services/rc/net/bundle.interface.br0/type rename to main/nnd-s6-services/rc/bundle.interface.wg-tunnel/type diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtinterfaced b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtinterfaced similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtinterfaced rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtinterfaced diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtnetworkd b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnetworkd similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtnetworkd rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnetworkd diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtnodedevd b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnodedevd similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtnodedevd rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnodedevd diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtproxyd b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtproxyd similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtproxyd rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtproxyd diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtqemud b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtqemud similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtqemud rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtqemud diff --git a/main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtstoraged b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtstoraged similarity index 100% rename from main/nnd-s6-services/rc/libvirt/bundle.libvirt/contents.d/virtstoraged rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtstoraged diff --git a/main/nnd-s6-services/rc/net/bundle.net/type b/main/nnd-s6-services/rc/bundle.libvirt/type similarity index 100% rename from main/nnd-s6-services/rc/net/bundle.net/type rename to main/nnd-s6-services/rc/bundle.libvirt/type diff --git a/main/nnd-s6-services/rc/net/bundle.net/contents.d/bundle.interface.br0 b/main/nnd-s6-services/rc/bundle.net/contents.d/bundle.interface.br0 similarity index 100% rename from main/nnd-s6-services/rc/net/bundle.net/contents.d/bundle.interface.br0 rename to main/nnd-s6-services/rc/bundle.net/contents.d/bundle.interface.br0 diff --git a/main/nnd-s6-services/rc/net/bundle.net/contents.d/ntpd.1 b/main/nnd-s6-services/rc/bundle.net/contents.d/ntpd.1 similarity index 100% rename from main/nnd-s6-services/rc/net/bundle.net/contents.d/ntpd.1 rename to main/nnd-s6-services/rc/bundle.net/contents.d/ntpd.1 diff --git a/main/nnd-s6-services/rc/tunnel/bundle.interface.wg-tunnel/type b/main/nnd-s6-services/rc/bundle.net/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/bundle.interface.wg-tunnel/type rename to main/nnd-s6-services/rc/bundle.net/type diff --git a/main/nnd-s6-services/rc/virtual/bundle.virtual/contents.d/qemu-ga b/main/nnd-s6-services/rc/bundle.virtual/contents.d/qemu-ga similarity index 100% rename from main/nnd-s6-services/rc/virtual/bundle.virtual/contents.d/qemu-ga rename to main/nnd-s6-services/rc/bundle.virtual/contents.d/qemu-ga diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/type b/main/nnd-s6-services/rc/bundle.virtual/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/type rename to main/nnd-s6-services/rc/bundle.virtual/type diff --git a/main/nnd-s6-services/rc/core/clock.hw/dependencies.d/mount.dev b/main/nnd-s6-services/rc/clock.hw/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/core/clock.hw/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/clock.hw/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/core/hostname/type b/main/nnd-s6-services/rc/clock.hw/type similarity index 100% rename from main/nnd-s6-services/rc/core/hostname/type rename to main/nnd-s6-services/rc/clock.hw/type diff --git a/main/nnd-s6-services/rc/core/clock.hw/up b/main/nnd-s6-services/rc/clock.hw/up similarity index 100% rename from main/nnd-s6-services/rc/core/clock.hw/up rename to main/nnd-s6-services/rc/clock.hw/up diff --git a/main/nnd-s6-services/rc/core/hostname/HOSTNAME b/main/nnd-s6-services/rc/core/hostname/HOSTNAME deleted file mode 100644 index 2fbb50c..0000000 --- a/main/nnd-s6-services/rc/core/hostname/HOSTNAME +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/main/nnd-s6-services/rc/core/mount.run/up b/main/nnd-s6-services/rc/core/mount.run/up deleted file mode 100644 index e0f629a..0000000 --- a/main/nnd-s6-services/rc/core/mount.run/up +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.run -importas -i OPTS OPTS -emptyenv - -export PATH $PATH -define DEST /run -define FSTYPE tmpfs - -fdclose 1 -fdclose 2 - -foreground { - mkdir -p $DEST -} mount -t $FSTYPE -o $OPTS run $DEST diff --git a/main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/up b/main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/up deleted file mode 100644 index a2a5ced..0000000 --- a/main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/up +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.sys-firmware-efi-efivars -importas -i OPTS OPTS -emptyenv - -export PATH $PATH -define DEST /sys/firmware/efi/efivars -define FSTYPE efivarfs - -fdclose 1 -fdclose 2 - -foreground { - mkdir -p $DEST -} mount -t $FSTYPE -o $OPTS securityfs $DEST diff --git a/main/nnd-s6-services/rc/core/mount.sys-fs-pstore/up b/main/nnd-s6-services/rc/core/mount.sys-fs-pstore/up deleted file mode 100644 index 31a2ffa..0000000 --- a/main/nnd-s6-services/rc/core/mount.sys-fs-pstore/up +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.sys-fs-pstore -importas -i OPTS OPTS -emptyenv - -export PATH $PATH -define DEST /sys/fs/pstore -define FSTYPE pstore - -fdclose 1 -fdclose 2 - -foreground { - mkdir -p $DEST -} mount -t $FSTYPE -o $OPTS securityfs $DEST diff --git a/main/nnd-s6-services/rc/core/mount.tmp/up b/main/nnd-s6-services/rc/core/mount.tmp/up deleted file mode 100644 index 6902a2d..0000000 --- a/main/nnd-s6-services/rc/core/mount.tmp/up +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.tmp -importas -i OPTS OPTS -emptyenv - -export PATH $PATH -define DEST /tmp -define FSTYPE tmpfs - -fdclose 1 -fdclose 2 - -foreground { - mkdir -p $DEST -} mount -t $FSTYPE -o $OPTS tmp $DEST diff --git a/main/nnd-s6-services/rc/core/dir.var-log/dependencies.d/mount.root b/main/nnd-s6-services/rc/dir.var-empty/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/core/dir.var-log/dependencies.d/mount.root rename to main/nnd-s6-services/rc/dir.var-empty/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/net/dir.var-empty/down b/main/nnd-s6-services/rc/dir.var-empty/down similarity index 100% rename from main/nnd-s6-services/rc/net/dir.var-empty/down rename to main/nnd-s6-services/rc/dir.var-empty/down diff --git a/main/nnd-s6-services/rc/core/kmod.sysfs/type b/main/nnd-s6-services/rc/dir.var-empty/type similarity index 100% rename from main/nnd-s6-services/rc/core/kmod.sysfs/type rename to main/nnd-s6-services/rc/dir.var-empty/type diff --git a/main/nnd-s6-services/rc/net/dir.var-empty/up b/main/nnd-s6-services/rc/dir.var-empty/up similarity index 100% rename from main/nnd-s6-services/rc/net/dir.var-empty/up rename to main/nnd-s6-services/rc/dir.var-empty/up diff --git a/main/nnd-s6-services/rc/core/utmpd/dependencies.d/mount.root b/main/nnd-s6-services/rc/dir.var-lock/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/core/utmpd/dependencies.d/mount.root rename to main/nnd-s6-services/rc/dir.var-lock/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/dir.var-lock/down b/main/nnd-s6-services/rc/dir.var-lock/down new file mode 100644 index 0000000..60a012c --- /dev/null +++ b/main/nnd-s6-services/rc/dir.var-lock/down @@ -0,0 +1,13 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +emptyenv + +export PATH $PATH +# DO NOT LET DIR BE EMPTY, YOU HAVE BEEN WARNED +define DIR /var/empty + +fdclose 1 +fdclose 2 + +exec rm -rf $DIR diff --git a/main/nnd-s6-services/rc/core/mdevd.coldplug/type b/main/nnd-s6-services/rc/dir.var-lock/type similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd.coldplug/type rename to main/nnd-s6-services/rc/dir.var-lock/type diff --git a/main/nnd-s6-services/rc/dir.var-lock/up b/main/nnd-s6-services/rc/dir.var-lock/up new file mode 100644 index 0000000..f4ae464 --- /dev/null +++ b/main/nnd-s6-services/rc/dir.var-lock/up @@ -0,0 +1,12 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +emptyenv + +export PATH $PATH +define DIR /var/empty + +fdclose 1 +fdclose 2 + +exec mkdir -p $DIR diff --git a/main/nnd-s6-services/rc/libvirt/virtlockd/dependencies.d/mount.root b/main/nnd-s6-services/rc/dir.var-log/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlockd/dependencies.d/mount.root rename to main/nnd-s6-services/rc/dir.var-log/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/core/module.apparmor/type b/main/nnd-s6-services/rc/dir.var-log/type similarity index 100% rename from main/nnd-s6-services/rc/core/module.apparmor/type rename to main/nnd-s6-services/rc/dir.var-log/type diff --git a/main/nnd-s6-services/rc/core/dir.var-log/up b/main/nnd-s6-services/rc/dir.var-log/up similarity index 100% rename from main/nnd-s6-services/rc/core/dir.var-log/up rename to main/nnd-s6-services/rc/dir.var-log/up diff --git a/main/nnd-s6-services/rc/desktop/dwm.0/dependencies.d/xorg.0 b/main/nnd-s6-services/rc/dwm.0/dependencies.d/xorg.0 similarity index 100% rename from main/nnd-s6-services/rc/desktop/dwm.0/dependencies.d/xorg.0 rename to main/nnd-s6-services/rc/dwm.0/dependencies.d/xorg.0 diff --git a/main/nnd-s6-services/rc/desktop/dwm.0/producer-for b/main/nnd-s6-services/rc/dwm.0/producer-for similarity index 100% rename from main/nnd-s6-services/rc/desktop/dwm.0/producer-for rename to main/nnd-s6-services/rc/dwm.0/producer-for diff --git a/main/nnd-s6-services/rc/desktop/dwm.0/run b/main/nnd-s6-services/rc/dwm.0/run similarity index 100% rename from main/nnd-s6-services/rc/desktop/dwm.0/run rename to main/nnd-s6-services/rc/dwm.0/run diff --git a/main/nnd-s6-services/rc/core/getty.tty1/type b/main/nnd-s6-services/rc/dwm.0/type similarity index 100% rename from main/nnd-s6-services/rc/core/getty.tty1/type rename to main/nnd-s6-services/rc/dwm.0/type diff --git a/main/nnd-s6-services/rc/core/getty.tty1/dependencies.d/hostname b/main/nnd-s6-services/rc/getty.tty1/dependencies.d/hostname similarity index 100% rename from main/nnd-s6-services/rc/core/getty.tty1/dependencies.d/hostname rename to main/nnd-s6-services/rc/getty.tty1/dependencies.d/hostname diff --git a/main/nnd-s6-services/rc/core/getty.tty1/dependencies.d/syslogd b/main/nnd-s6-services/rc/getty.tty1/dependencies.d/syslogd similarity index 100% rename from main/nnd-s6-services/rc/core/getty.tty1/dependencies.d/syslogd rename to main/nnd-s6-services/rc/getty.tty1/dependencies.d/syslogd diff --git a/main/nnd-s6-services/rc/core/getty.tty1/run b/main/nnd-s6-services/rc/getty.tty1/run similarity index 81% rename from main/nnd-s6-services/rc/core/getty.tty1/run rename to main/nnd-s6-services/rc/getty.tty1/run index 1414a14..cc9b78b 100755 --- a/main/nnd-s6-services/rc/core/getty.tty1/run +++ b/main/nnd-s6-services/rc/getty.tty1/run @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/getty.tty1 +s6-envdir -i /etc/s6/env/getty.tty1 importas -i BAUD BAUD emptyenv diff --git a/main/nnd-s6-services/rc/core/klogd/type b/main/nnd-s6-services/rc/getty.tty1/type similarity index 100% rename from main/nnd-s6-services/rc/core/klogd/type rename to main/nnd-s6-services/rc/getty.tty1/type diff --git a/main/nnd-s6-services/rc/core/hostname/dependencies.d/mount.proc b/main/nnd-s6-services/rc/hostname/dependencies.d/mount.proc similarity index 100% rename from main/nnd-s6-services/rc/core/hostname/dependencies.d/mount.proc rename to main/nnd-s6-services/rc/hostname/dependencies.d/mount.proc diff --git a/main/nnd-s6-services/rc/core/module.dm-mod/type b/main/nnd-s6-services/rc/hostname/type similarity index 100% rename from main/nnd-s6-services/rc/core/module.dm-mod/type rename to main/nnd-s6-services/rc/hostname/type diff --git a/main/nnd-s6-services/rc/core/hostname/up b/main/nnd-s6-services/rc/hostname/up similarity index 84% rename from main/nnd-s6-services/rc/core/hostname/up rename to main/nnd-s6-services/rc/hostname/up index db86082..277b11e 100644 --- a/main/nnd-s6-services/rc/core/hostname/up +++ b/main/nnd-s6-services/rc/hostname/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/hostname +s6-envdir -i /etc/s6/env/hostname importas -i HOSTNAME HOSTNAME emptyenv diff --git a/main/nnd-s6-services/rc/net/interface.br0.link/dependencies.d/bridge.br0 b/main/nnd-s6-services/rc/interface.br0.link/dependencies.d/bridge.br0 similarity index 100% rename from main/nnd-s6-services/rc/net/interface.br0.link/dependencies.d/bridge.br0 rename to main/nnd-s6-services/rc/interface.br0.link/dependencies.d/bridge.br0 diff --git a/main/nnd-s6-services/rc/net/interface.br0.link/down b/main/nnd-s6-services/rc/interface.br0.link/down similarity index 100% rename from main/nnd-s6-services/rc/net/interface.br0.link/down rename to main/nnd-s6-services/rc/interface.br0.link/down diff --git a/main/nnd-s6-services/rc/core/module.fuse/type b/main/nnd-s6-services/rc/interface.br0.link/type similarity index 100% rename from main/nnd-s6-services/rc/core/module.fuse/type rename to main/nnd-s6-services/rc/interface.br0.link/type diff --git a/main/nnd-s6-services/rc/net/interface.br0.link/up b/main/nnd-s6-services/rc/interface.br0.link/up similarity index 100% rename from main/nnd-s6-services/rc/net/interface.br0.link/up rename to main/nnd-s6-services/rc/interface.br0.link/up diff --git a/main/nnd-s6-services/rc/net/interface.eth0.link/dependencies.d/interface.eth0.ready b/main/nnd-s6-services/rc/interface.eth0.link/dependencies.d/interface.eth0.ready similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.link/dependencies.d/interface.eth0.ready rename to main/nnd-s6-services/rc/interface.eth0.link/dependencies.d/interface.eth0.ready diff --git a/main/nnd-s6-services/rc/net/interface.eth0.link/down b/main/nnd-s6-services/rc/interface.eth0.link/down similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.link/down rename to main/nnd-s6-services/rc/interface.eth0.link/down diff --git a/main/nnd-s6-services/rc/core/module.tun/type b/main/nnd-s6-services/rc/interface.eth0.link/type similarity index 100% rename from main/nnd-s6-services/rc/core/module.tun/type rename to main/nnd-s6-services/rc/interface.eth0.link/type diff --git a/main/nnd-s6-services/rc/net/interface.eth0.link/up b/main/nnd-s6-services/rc/interface.eth0.link/up similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.link/up rename to main/nnd-s6-services/rc/interface.eth0.link/up diff --git a/main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/interface.eth0.ready/dependencies.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/interface.eth0.ready/dependencies.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/core/module.wireguard/type b/main/nnd-s6-services/rc/interface.eth0.ready/type similarity index 100% rename from main/nnd-s6-services/rc/core/module.wireguard/type rename to main/nnd-s6-services/rc/interface.eth0.ready/type diff --git a/main/nnd-s6-services/rc/net/interface.eth0.ready/up b/main/nnd-s6-services/rc/interface.eth0.ready/up similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.ready/up rename to main/nnd-s6-services/rc/interface.eth0.ready/up diff --git a/main/nnd-s6-services/rc/net/interface.lo.link/down b/main/nnd-s6-services/rc/interface.lo.link/down similarity index 100% rename from main/nnd-s6-services/rc/net/interface.lo.link/down rename to main/nnd-s6-services/rc/interface.lo.link/down diff --git a/main/nnd-s6-services/rc/core/mount.boot-efi/type b/main/nnd-s6-services/rc/interface.lo.link/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.boot-efi/type rename to main/nnd-s6-services/rc/interface.lo.link/type diff --git a/main/nnd-s6-services/rc/net/interface.lo.link/up b/main/nnd-s6-services/rc/interface.lo.link/up similarity index 100% rename from main/nnd-s6-services/rc/net/interface.lo.link/up rename to main/nnd-s6-services/rc/interface.lo.link/up diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/dependencies.d/module.wireguard b/main/nnd-s6-services/rc/interface.wg-tunnel.create/dependencies.d/module.wireguard similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/dependencies.d/module.wireguard rename to main/nnd-s6-services/rc/interface.wg-tunnel.create/dependencies.d/module.wireguard diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/down b/main/nnd-s6-services/rc/interface.wg-tunnel.create/down similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/down rename to main/nnd-s6-services/rc/interface.wg-tunnel.create/down diff --git a/main/nnd-s6-services/rc/core/mount.boot/type b/main/nnd-s6-services/rc/interface.wg-tunnel.create/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.boot/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.create/type diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/up b/main/nnd-s6-services/rc/interface.wg-tunnel.create/up similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/up rename to main/nnd-s6-services/rc/interface.wg-tunnel.create/up diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/dependencies.d/wg-config.wg-tunnel b/main/nnd-s6-services/rc/interface.wg-tunnel.link/dependencies.d/wg-config.wg-tunnel similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/dependencies.d/wg-config.wg-tunnel rename to main/nnd-s6-services/rc/interface.wg-tunnel.link/dependencies.d/wg-config.wg-tunnel diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/down b/main/nnd-s6-services/rc/interface.wg-tunnel.link/down similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/down rename to main/nnd-s6-services/rc/interface.wg-tunnel.link/down diff --git a/main/nnd-s6-services/rc/core/mount.dev-mqueue/type b/main/nnd-s6-services/rc/interface.wg-tunnel.link/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev-mqueue/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.link/type diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/up b/main/nnd-s6-services/rc/interface.wg-tunnel.link/up similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/up rename to main/nnd-s6-services/rc/interface.wg-tunnel.link/up diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/dependencies.d/interface.wg-tunnel.link similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/dependencies.d/interface.wg-tunnel.link diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/down rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down index 43b9804..fd9a0cb 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/down +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/down @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.addr.4 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.4 importas -i ADDR ADDR emptyenv diff --git a/main/nnd-s6-services/rc/core/mount.dev-pts/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev-pts/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/type diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/up rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up index 80cb342..fbfd7cc 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/up +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.4/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.addr.4 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.4 importas -i ADDR ADDR emptyenv diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/dependencies.d/interface.wg-tunnel.link similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/dependencies.d/interface.wg-tunnel.link diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/down rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down index 0cb0172..b60ce1e 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/down +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/down @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.addr.6 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.6 importas -i ADDR ADDR emptyenv diff --git a/main/nnd-s6-services/rc/core/mount.dev-shm/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev-shm/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/type diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/up rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up index fec44e5..0fb2bd3 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/up +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.addr.6/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.addr.6 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.addr.6 importas -i ADDR ADDR emptyenv diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/dependencies.d/interface.wg-tunnel.link similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/dependencies.d/interface.wg-tunnel.link diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/down rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down index c1d5a02..a80c74a 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/down +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/down @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.route.4 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.4 importas -i ROUTE ROUTE emptyenv diff --git a/main/nnd-s6-services/rc/core/mount.dev/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/type diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/up rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up index 3355eed..a6cef1d 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/up +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.4/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.route.4 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.4 importas -i ROUTE ROUTE emptyenv diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/dependencies.d/interface.wg-tunnel.link b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/dependencies.d/interface.wg-tunnel.link similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/dependencies.d/interface.wg-tunnel.link rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/dependencies.d/interface.wg-tunnel.link diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/down b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/down rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down index e557a13..d99e398 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/down +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/down @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.route.6 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.6 importas -i ROUTE ROUTE emptyenv diff --git a/main/nnd-s6-services/rc/core/mount.proc/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.proc/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/type diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/up b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up similarity index 76% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/up rename to main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up index 540b3d8..9d57313 100644 --- a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/up +++ b/main/nnd-s6-services/rc/interface.wg-tunnel.static.route.6/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/interface.wg-tunnel.static.route.6 +s6-envdir -i /etc/s6/env/interface.wg-tunnel.static.route.6 importas -i ROUTE ROUTE emptyenv diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.4 b/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.4 similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.4 rename to main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.4 diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.6 b/main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.6 similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.6 rename to main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.addr.6 diff --git a/main/nnd-s6-services/rc/tunnel/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 similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.4 rename to main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.4 diff --git a/main/nnd-s6-services/rc/tunnel/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 similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.6 rename to main/nnd-s6-services/rc/interface.wg-tunnel.static/contents.d/interface.wg-tunnel.static.route.6 diff --git a/main/nnd-s6-services/rc/virtual/bundle.virtual/type b/main/nnd-s6-services/rc/interface.wg-tunnel.static/type similarity index 100% rename from main/nnd-s6-services/rc/virtual/bundle.virtual/type rename to main/nnd-s6-services/rc/interface.wg-tunnel.static/type diff --git a/main/nnd-s6-services/rc/core/klogd/dependencies.d/hostname b/main/nnd-s6-services/rc/klogd/dependencies.d/hostname similarity index 100% rename from main/nnd-s6-services/rc/core/klogd/dependencies.d/hostname rename to main/nnd-s6-services/rc/klogd/dependencies.d/hostname diff --git a/main/nnd-s6-services/rc/core/klogd/dependencies.d/mount.proc b/main/nnd-s6-services/rc/klogd/dependencies.d/mount.proc similarity index 100% rename from main/nnd-s6-services/rc/core/klogd/dependencies.d/mount.proc rename to main/nnd-s6-services/rc/klogd/dependencies.d/mount.proc diff --git a/main/nnd-s6-services/rc/core/klogd/producer-for b/main/nnd-s6-services/rc/klogd/producer-for similarity index 100% rename from main/nnd-s6-services/rc/core/klogd/producer-for rename to main/nnd-s6-services/rc/klogd/producer-for diff --git a/main/nnd-s6-services/rc/core/klogd/run b/main/nnd-s6-services/rc/klogd/run similarity index 100% rename from main/nnd-s6-services/rc/core/klogd/run rename to main/nnd-s6-services/rc/klogd/run diff --git a/main/nnd-s6-services/rc/core/logger.klogd/type b/main/nnd-s6-services/rc/klogd/type similarity index 100% rename from main/nnd-s6-services/rc/core/logger.klogd/type rename to main/nnd-s6-services/rc/klogd/type diff --git a/main/nnd-s6-services/rc/core/kmod.sysfs/dependencies.d/mount.sys b/main/nnd-s6-services/rc/kmod.sysfs/dependencies.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/core/kmod.sysfs/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/kmod.sysfs/dependencies.d/mount.sys diff --git a/main/nnd-s6-services/rc/core/kmod.sysfs/dependencies.d/syslogd b/main/nnd-s6-services/rc/kmod.sysfs/dependencies.d/syslogd similarity index 100% rename from main/nnd-s6-services/rc/core/kmod.sysfs/dependencies.d/syslogd rename to main/nnd-s6-services/rc/kmod.sysfs/dependencies.d/syslogd diff --git a/main/nnd-s6-services/rc/core/mount.root/type b/main/nnd-s6-services/rc/kmod.sysfs/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.root/type rename to main/nnd-s6-services/rc/kmod.sysfs/type diff --git a/main/nnd-s6-services/rc/core/kmod.sysfs/up b/main/nnd-s6-services/rc/kmod.sysfs/up similarity index 100% rename from main/nnd-s6-services/rc/core/kmod.sysfs/up rename to main/nnd-s6-services/rc/kmod.sysfs/up diff --git a/main/nnd-s6-services/rc/desktop/logger.dwm/consumer-for b/main/nnd-s6-services/rc/logger.dwm/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.dwm/consumer-for rename to main/nnd-s6-services/rc/logger.dwm/consumer-for diff --git a/main/nnd-s6-services/rc/core/logger.klogd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.dwm/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/core/logger.klogd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.dwm/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/core/logger.klogd/notification-fd b/main/nnd-s6-services/rc/logger.dwm/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/core/logger.klogd/notification-fd rename to main/nnd-s6-services/rc/logger.dwm/notification-fd diff --git a/main/nnd-s6-services/rc/desktop/logger.dwm/run b/main/nnd-s6-services/rc/logger.dwm/run similarity index 88% rename from main/nnd-s6-services/rc/desktop/logger.dwm/run rename to main/nnd-s6-services/rc/logger.dwm/run index 8534ae6..938c575 100755 --- a/main/nnd-s6-services/rc/desktop/logger.dwm/run +++ b/main/nnd-s6-services/rc/logger.dwm/run @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir /etc/s6/env/core/logger +s6-envdir /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX emptyenv diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/type b/main/nnd-s6-services/rc/logger.dwm/type similarity index 100% rename from main/nnd-s6-services/rc/core/logger.mdevd/type rename to main/nnd-s6-services/rc/logger.dwm/type diff --git a/main/nnd-s6-services/rc/core/logger.klogd/consumer-for b/main/nnd-s6-services/rc/logger.klogd/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/core/logger.klogd/consumer-for rename to main/nnd-s6-services/rc/logger.klogd/consumer-for diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.klogd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/core/logger.mdevd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.klogd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/notification-fd b/main/nnd-s6-services/rc/logger.klogd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/core/logger.mdevd/notification-fd rename to main/nnd-s6-services/rc/logger.klogd/notification-fd diff --git a/main/nnd-s6-services/rc/core/logger.klogd/run b/main/nnd-s6-services/rc/logger.klogd/run similarity index 88% rename from main/nnd-s6-services/rc/core/logger.klogd/run rename to main/nnd-s6-services/rc/logger.klogd/run index 9a2c576..d8c4522 100755 --- a/main/nnd-s6-services/rc/core/logger.klogd/run +++ b/main/nnd-s6-services/rc/logger.klogd/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/core/logger.klogd +s6-envdir -I /etc/s6/env/logger.klogd importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/core/logger.syslogd/type b/main/nnd-s6-services/rc/logger.klogd/type similarity index 100% rename from main/nnd-s6-services/rc/core/logger.syslogd/type rename to main/nnd-s6-services/rc/logger.klogd/type diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/consumer-for b/main/nnd-s6-services/rc/logger.mdevd/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/core/logger.mdevd/consumer-for rename to main/nnd-s6-services/rc/logger.mdevd/consumer-for diff --git a/main/nnd-s6-services/rc/core/logger.syslogd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.mdevd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/core/logger.syslogd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.mdevd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/core/logger.syslogd/notification-fd b/main/nnd-s6-services/rc/logger.mdevd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/core/logger.syslogd/notification-fd rename to main/nnd-s6-services/rc/logger.mdevd/notification-fd diff --git a/main/nnd-s6-services/rc/core/logger.mdevd/run b/main/nnd-s6-services/rc/logger.mdevd/run similarity index 88% rename from main/nnd-s6-services/rc/core/logger.mdevd/run rename to main/nnd-s6-services/rc/logger.mdevd/run index 26640a3..522a6ab 100755 --- a/main/nnd-s6-services/rc/core/logger.mdevd/run +++ b/main/nnd-s6-services/rc/logger.mdevd/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/core/logger.mdevd +s6-envdir -I /etc/s6/env/logger.mdevd importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/core/mdevd/type b/main/nnd-s6-services/rc/logger.mdevd/type similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd/type rename to main/nnd-s6-services/rc/logger.mdevd/type diff --git a/main/nnd-s6-services/rc/net/logger.ntpd/consumer-for b/main/nnd-s6-services/rc/logger.ntpd/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/net/logger.ntpd/consumer-for rename to main/nnd-s6-services/rc/logger.ntpd/consumer-for diff --git a/main/nnd-s6-services/rc/core/utmpd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.ntpd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/core/utmpd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.ntpd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/core/mdevd/notification-fd b/main/nnd-s6-services/rc/logger.ntpd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd/notification-fd rename to main/nnd-s6-services/rc/logger.ntpd/notification-fd diff --git a/main/nnd-s6-services/rc/net/logger.ntpd/run b/main/nnd-s6-services/rc/logger.ntpd/run similarity index 88% rename from main/nnd-s6-services/rc/net/logger.ntpd/run rename to main/nnd-s6-services/rc/logger.ntpd/run index 78d5b98..c46cb8e 100755 --- a/main/nnd-s6-services/rc/net/logger.ntpd/run +++ b/main/nnd-s6-services/rc/logger.ntpd/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/net/logger.ntpd +s6-envdir -I /etc/s6/env/logger.ntpd importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/core/syslogd/type b/main/nnd-s6-services/rc/logger.ntpd/type similarity index 100% rename from main/nnd-s6-services/rc/core/syslogd/type rename to main/nnd-s6-services/rc/logger.ntpd/type diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/consumer-for b/main/nnd-s6-services/rc/logger.qemu-ga/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/virtual/logger.qemu-ga/consumer-for rename to main/nnd-s6-services/rc/logger.qemu-ga/consumer-for diff --git a/main/nnd-s6-services/rc/desktop/logger.dwm/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.qemu-ga/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.dwm/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.qemu-ga/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/core/syslogd/notification-fd b/main/nnd-s6-services/rc/logger.qemu-ga/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/core/syslogd/notification-fd rename to main/nnd-s6-services/rc/logger.qemu-ga/notification-fd diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/run b/main/nnd-s6-services/rc/logger.qemu-ga/run similarity index 87% rename from main/nnd-s6-services/rc/virtual/logger.qemu-ga/run rename to main/nnd-s6-services/rc/logger.qemu-ga/run index c06cc3c..8800cff 100755 --- a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/run +++ b/main/nnd-s6-services/rc/logger.qemu-ga/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/virtual/logger.qemu-ga +s6-envdir -I /etc/s6/env/logger.qemu-ga importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/core/utmpd/type b/main/nnd-s6-services/rc/logger.qemu-ga/type similarity index 100% rename from main/nnd-s6-services/rc/core/utmpd/type rename to main/nnd-s6-services/rc/logger.qemu-ga/type diff --git a/main/nnd-s6-services/rc/net/logger.sshd/consumer-for b/main/nnd-s6-services/rc/logger.sshd/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/net/logger.sshd/consumer-for rename to main/nnd-s6-services/rc/logger.sshd/consumer-for diff --git a/main/nnd-s6-services/rc/desktop/logger.udevd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.sshd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.udevd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.sshd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/desktop/logger.dwm/notification-fd b/main/nnd-s6-services/rc/logger.sshd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.dwm/notification-fd rename to main/nnd-s6-services/rc/logger.sshd/notification-fd diff --git a/main/nnd-s6-services/rc/net/logger.sshd/run b/main/nnd-s6-services/rc/logger.sshd/run similarity index 88% rename from main/nnd-s6-services/rc/net/logger.sshd/run rename to main/nnd-s6-services/rc/logger.sshd/run index 127beb0..06998e9 100755 --- a/main/nnd-s6-services/rc/net/logger.sshd/run +++ b/main/nnd-s6-services/rc/logger.sshd/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/net/logger.ntpd +s6-envdir -I /etc/s6/env/logger.ntpd importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/desktop/dwm.0/type b/main/nnd-s6-services/rc/logger.sshd/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/dwm.0/type rename to main/nnd-s6-services/rc/logger.sshd/type diff --git a/main/nnd-s6-services/rc/core/logger.syslogd/consumer-for b/main/nnd-s6-services/rc/logger.syslogd/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/core/logger.syslogd/consumer-for rename to main/nnd-s6-services/rc/logger.syslogd/consumer-for diff --git a/main/nnd-s6-services/rc/desktop/logger.xorg/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.syslogd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.xorg/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.syslogd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/desktop/logger.udevd/notification-fd b/main/nnd-s6-services/rc/logger.syslogd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.udevd/notification-fd rename to main/nnd-s6-services/rc/logger.syslogd/notification-fd diff --git a/main/nnd-s6-services/rc/core/logger.syslogd/run b/main/nnd-s6-services/rc/logger.syslogd/run similarity index 87% rename from main/nnd-s6-services/rc/core/logger.syslogd/run rename to main/nnd-s6-services/rc/logger.syslogd/run index 9075f20..18ddb71 100755 --- a/main/nnd-s6-services/rc/core/logger.syslogd/run +++ b/main/nnd-s6-services/rc/logger.syslogd/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/core/logger.syslogd +s6-envdir -I /etc/s6/env/logger.syslogd importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/desktop/logger.dwm/type b/main/nnd-s6-services/rc/logger.syslogd/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.dwm/type rename to main/nnd-s6-services/rc/logger.syslogd/type diff --git a/main/nnd-s6-services/rc/desktop/logger.udevd/consumer-for b/main/nnd-s6-services/rc/logger.udevd/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.udevd/consumer-for rename to main/nnd-s6-services/rc/logger.udevd/consumer-for diff --git a/main/nnd-s6-services/rc/net/logger.ntpd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.udevd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/net/logger.ntpd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.udevd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/desktop/logger.xorg/notification-fd b/main/nnd-s6-services/rc/logger.udevd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.xorg/notification-fd rename to main/nnd-s6-services/rc/logger.udevd/notification-fd diff --git a/main/nnd-s6-services/rc/desktop/logger.udevd/run b/main/nnd-s6-services/rc/logger.udevd/run similarity index 88% rename from main/nnd-s6-services/rc/desktop/logger.udevd/run rename to main/nnd-s6-services/rc/logger.udevd/run index 6e96f2d..375ffa3 100755 --- a/main/nnd-s6-services/rc/desktop/logger.udevd/run +++ b/main/nnd-s6-services/rc/logger.udevd/run @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir /etc/s6/env/core/logger +s6-envdir /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX emptyenv diff --git a/main/nnd-s6-services/rc/desktop/logger.udevd/type b/main/nnd-s6-services/rc/logger.udevd/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.udevd/type rename to main/nnd-s6-services/rc/logger.udevd/type diff --git a/main/nnd-s6-services/rc/net/logger.udhcpc/consumer-for b/main/nnd-s6-services/rc/logger.udhcpc/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/net/logger.udhcpc/consumer-for rename to main/nnd-s6-services/rc/logger.udhcpc/consumer-for diff --git a/main/nnd-s6-services/rc/net/logger.sshd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.udhcpc/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/net/logger.sshd/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.udhcpc/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/desktop/xorg.0/notification-fd b/main/nnd-s6-services/rc/logger.udhcpc/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/desktop/xorg.0/notification-fd rename to main/nnd-s6-services/rc/logger.udhcpc/notification-fd diff --git a/main/nnd-s6-services/rc/net/logger.udhcpc/run b/main/nnd-s6-services/rc/logger.udhcpc/run similarity index 88% rename from main/nnd-s6-services/rc/net/logger.udhcpc/run rename to main/nnd-s6-services/rc/logger.udhcpc/run index 0f63c4f..858f47b 100755 --- a/main/nnd-s6-services/rc/net/logger.udhcpc/run +++ b/main/nnd-s6-services/rc/logger.udhcpc/run @@ -5,7 +5,7 @@ importas -i PATH PATH s6-envdir -i /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX -s6-envdir -I /etc/s6/env/net/logger.udhcpc +s6-envdir -I /etc/s6/env/logger.udhcpc importas -i LOGSIZE LOGSIZE importas -i LOGARCHIVES LOGARCHIVES diff --git a/main/nnd-s6-services/rc/desktop/logger.xorg/type b/main/nnd-s6-services/rc/logger.udhcpc/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.xorg/type rename to main/nnd-s6-services/rc/logger.udhcpc/type diff --git a/main/nnd-s6-services/rc/desktop/logger.xorg/consumer-for b/main/nnd-s6-services/rc/logger.xorg/consumer-for similarity index 100% rename from main/nnd-s6-services/rc/desktop/logger.xorg/consumer-for rename to main/nnd-s6-services/rc/logger.xorg/consumer-for diff --git a/main/nnd-s6-services/rc/net/logger.udhcpc/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.xorg/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/net/logger.udhcpc/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/logger.xorg/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/net/logger.ntpd/notification-fd b/main/nnd-s6-services/rc/logger.xorg/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/net/logger.ntpd/notification-fd rename to main/nnd-s6-services/rc/logger.xorg/notification-fd diff --git a/main/nnd-s6-services/rc/desktop/logger.xorg/run b/main/nnd-s6-services/rc/logger.xorg/run similarity index 88% rename from main/nnd-s6-services/rc/desktop/logger.xorg/run rename to main/nnd-s6-services/rc/logger.xorg/run index 9800ab1..f72d636 100755 --- a/main/nnd-s6-services/rc/desktop/logger.xorg/run +++ b/main/nnd-s6-services/rc/logger.xorg/run @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir /etc/s6/env/core/logger +s6-envdir /etc/s6/env/logger importas -i LOGPREFIX LOGPREFIX emptyenv diff --git a/main/nnd-s6-services/rc/desktop/udevd/type b/main/nnd-s6-services/rc/logger.xorg/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd/type rename to main/nnd-s6-services/rc/logger.xorg/type diff --git a/main/nnd-s6-services/rc/core/mdevd.coldplug/dependencies.d/mdevd b/main/nnd-s6-services/rc/mdevd.coldplug/dependencies.d/mdevd similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd.coldplug/dependencies.d/mdevd rename to main/nnd-s6-services/rc/mdevd.coldplug/dependencies.d/mdevd diff --git a/main/nnd-s6-services/rc/core/mount.run/type b/main/nnd-s6-services/rc/mdevd.coldplug/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.run/type rename to main/nnd-s6-services/rc/mdevd.coldplug/type diff --git a/main/nnd-s6-services/rc/core/mdevd.coldplug/up b/main/nnd-s6-services/rc/mdevd.coldplug/up similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd.coldplug/up rename to main/nnd-s6-services/rc/mdevd.coldplug/up diff --git a/main/nnd-s6-services/rc/core/mdevd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mdevd/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/mdevd/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/core/mdevd/dependencies.d/mount.sys b/main/nnd-s6-services/rc/mdevd/dependencies.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/mdevd/dependencies.d/mount.sys diff --git a/main/nnd-s6-services/rc/net/logger.sshd/notification-fd b/main/nnd-s6-services/rc/mdevd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/net/logger.sshd/notification-fd rename to main/nnd-s6-services/rc/mdevd/notification-fd diff --git a/main/nnd-s6-services/rc/core/mdevd/producer-for b/main/nnd-s6-services/rc/mdevd/producer-for similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd/producer-for rename to main/nnd-s6-services/rc/mdevd/producer-for diff --git a/main/nnd-s6-services/rc/core/mdevd/run b/main/nnd-s6-services/rc/mdevd/run similarity index 100% rename from main/nnd-s6-services/rc/core/mdevd/run rename to main/nnd-s6-services/rc/mdevd/run diff --git a/main/nnd-s6-services/rc/desktop/xorg.0/type b/main/nnd-s6-services/rc/mdevd/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/xorg.0/type rename to main/nnd-s6-services/rc/mdevd/type diff --git a/main/nnd-s6-services/rc/core/module.apparmor/down b/main/nnd-s6-services/rc/module.apparmor/down similarity index 100% rename from main/nnd-s6-services/rc/core/module.apparmor/down rename to main/nnd-s6-services/rc/module.apparmor/down diff --git a/main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/type b/main/nnd-s6-services/rc/module.apparmor/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/type rename to main/nnd-s6-services/rc/module.apparmor/type diff --git a/main/nnd-s6-services/rc/core/module.apparmor/up b/main/nnd-s6-services/rc/module.apparmor/up similarity index 100% rename from main/nnd-s6-services/rc/core/module.apparmor/up rename to main/nnd-s6-services/rc/module.apparmor/up diff --git a/main/nnd-s6-services/rc/net/module.bridge/down b/main/nnd-s6-services/rc/module.bridge/down similarity index 100% rename from main/nnd-s6-services/rc/net/module.bridge/down rename to main/nnd-s6-services/rc/module.bridge/down diff --git a/main/nnd-s6-services/rc/core/mount.sys-fs-pstore/type b/main/nnd-s6-services/rc/module.bridge/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys-fs-pstore/type rename to main/nnd-s6-services/rc/module.bridge/type diff --git a/main/nnd-s6-services/rc/net/module.bridge/up b/main/nnd-s6-services/rc/module.bridge/up similarity index 100% rename from main/nnd-s6-services/rc/net/module.bridge/up rename to main/nnd-s6-services/rc/module.bridge/up diff --git a/main/nnd-s6-services/rc/core/module.dm-mod/down b/main/nnd-s6-services/rc/module.dm-mod/down similarity index 100% rename from main/nnd-s6-services/rc/core/module.dm-mod/down rename to main/nnd-s6-services/rc/module.dm-mod/down diff --git a/main/nnd-s6-services/rc/core/mount.sys-kernel-security/type b/main/nnd-s6-services/rc/module.dm-mod/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys-kernel-security/type rename to main/nnd-s6-services/rc/module.dm-mod/type diff --git a/main/nnd-s6-services/rc/core/module.dm-mod/up b/main/nnd-s6-services/rc/module.dm-mod/up similarity index 100% rename from main/nnd-s6-services/rc/core/module.dm-mod/up rename to main/nnd-s6-services/rc/module.dm-mod/up diff --git a/main/nnd-s6-services/rc/core/module.fuse/down b/main/nnd-s6-services/rc/module.fuse/down similarity index 100% rename from main/nnd-s6-services/rc/core/module.fuse/down rename to main/nnd-s6-services/rc/module.fuse/down diff --git a/main/nnd-s6-services/rc/core/mount.sys/type b/main/nnd-s6-services/rc/module.fuse/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys/type rename to main/nnd-s6-services/rc/module.fuse/type diff --git a/main/nnd-s6-services/rc/core/module.fuse/up b/main/nnd-s6-services/rc/module.fuse/up similarity index 100% rename from main/nnd-s6-services/rc/core/module.fuse/up rename to main/nnd-s6-services/rc/module.fuse/up diff --git a/main/nnd-s6-services/rc/net/module.ipv6/down b/main/nnd-s6-services/rc/module.ipv6/down similarity index 100% rename from main/nnd-s6-services/rc/net/module.ipv6/down rename to main/nnd-s6-services/rc/module.ipv6/down diff --git a/main/nnd-s6-services/rc/core/mount.tmp/type b/main/nnd-s6-services/rc/module.ipv6/type similarity index 100% rename from main/nnd-s6-services/rc/core/mount.tmp/type rename to main/nnd-s6-services/rc/module.ipv6/type diff --git a/main/nnd-s6-services/rc/net/module.ipv6/up b/main/nnd-s6-services/rc/module.ipv6/up similarity index 100% rename from main/nnd-s6-services/rc/net/module.ipv6/up rename to main/nnd-s6-services/rc/module.ipv6/up diff --git a/main/nnd-s6-services/rc/core/module.tun/down b/main/nnd-s6-services/rc/module.tun/down similarity index 100% rename from main/nnd-s6-services/rc/core/module.tun/down rename to main/nnd-s6-services/rc/module.tun/down diff --git a/main/nnd-s6-services/rc/desktop/udevd.settle/type b/main/nnd-s6-services/rc/module.tun/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd.settle/type rename to main/nnd-s6-services/rc/module.tun/type diff --git a/main/nnd-s6-services/rc/core/module.tun/up b/main/nnd-s6-services/rc/module.tun/up similarity index 100% rename from main/nnd-s6-services/rc/core/module.tun/up rename to main/nnd-s6-services/rc/module.tun/up diff --git a/main/nnd-s6-services/rc/core/module.wireguard/down b/main/nnd-s6-services/rc/module.wireguard/down similarity index 100% rename from main/nnd-s6-services/rc/core/module.wireguard/down rename to main/nnd-s6-services/rc/module.wireguard/down diff --git a/main/nnd-s6-services/rc/desktop/udevd.trigger/type b/main/nnd-s6-services/rc/module.wireguard/type similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd.trigger/type rename to main/nnd-s6-services/rc/module.wireguard/type diff --git a/main/nnd-s6-services/rc/core/module.wireguard/up b/main/nnd-s6-services/rc/module.wireguard/up similarity index 100% rename from main/nnd-s6-services/rc/core/module.wireguard/up rename to main/nnd-s6-services/rc/module.wireguard/up diff --git a/main/nnd-s6-services/rc/core/mount.dev-mqueue/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.boot-efi/dependencies.d/mount.boot similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev-mqueue/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/mount.boot-efi/dependencies.d/mount.boot diff --git a/main/nnd-s6-services/rc/mount.boot-efi/down b/main/nnd-s6-services/rc/mount.boot-efi/down new file mode 100644 index 0000000..e1da1c1 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.boot-efi/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 /boot/efi + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/net/bridge.br0.eth0/type b/main/nnd-s6-services/rc/mount.boot-efi/type similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0.eth0/type rename to main/nnd-s6-services/rc/mount.boot-efi/type diff --git a/main/nnd-s6-services/rc/core/mount.boot-efi/up b/main/nnd-s6-services/rc/mount.boot-efi/up similarity index 68% rename from main/nnd-s6-services/rc/core/mount.boot-efi/up rename to main/nnd-s6-services/rc/mount.boot-efi/up index 28f0f7e..8f1f750 100644 --- a/main/nnd-s6-services/rc/core/mount.boot-efi/up +++ b/main/nnd-s6-services/rc/mount.boot-efi/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.boot-efi +s6-envdir -i /etc/s6/env/mount.boot-efi importas -i SRC SRC importas -i FSTYPE FSTYPE importas -i OPTS OPTS @@ -14,5 +14,5 @@ fdclose 1 fdclose 2 foreground { - mkdir -p $DEST -} mount -t $FSTYPE -o $OPTS $SRC $DEST + exec mkdir -p $DEST +} exec mount -t $FSTYPE -o $OPTS $SRC $DEST diff --git a/main/nnd-s6-services/rc/libvirt/virtlogd/dependencies.d/mount.root b/main/nnd-s6-services/rc/mount.boot/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlogd/dependencies.d/mount.root rename to main/nnd-s6-services/rc/mount.boot/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/mount.boot/down b/main/nnd-s6-services/rc/mount.boot/down new file mode 100644 index 0000000..feecbb5 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.boot/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 /boot + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/net/bridge.br0/type b/main/nnd-s6-services/rc/mount.boot/type similarity index 100% rename from main/nnd-s6-services/rc/net/bridge.br0/type rename to main/nnd-s6-services/rc/mount.boot/type diff --git a/main/nnd-s6-services/rc/core/mount.boot/up b/main/nnd-s6-services/rc/mount.boot/up similarity index 68% rename from main/nnd-s6-services/rc/core/mount.boot/up rename to main/nnd-s6-services/rc/mount.boot/up index e7662c5..d0617b4 100644 --- a/main/nnd-s6-services/rc/core/mount.boot/up +++ b/main/nnd-s6-services/rc/mount.boot/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.boot +s6-envdir -i /etc/s6/env/mount.boot importas -i SRC SRC importas -i FSTYPE FSTYPE importas -i OPTS OPTS @@ -14,5 +14,5 @@ fdclose 1 fdclose 2 foreground { - mkdir -p $DEST -} mount -t $FSTYPE -o $OPTS $SRC $DEST + exec mkdir -p $DEST +} exec mount -t $FSTYPE -o $OPTS $SRC $DEST diff --git a/main/nnd-s6-services/rc/core/mount.dev-pts/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.dev-mqueue/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev-pts/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/mount.dev-mqueue/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/down b/main/nnd-s6-services/rc/mount.dev-mqueue/down new file mode 100644 index 0000000..155e773 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.dev-mqueue/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/mqueue + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/core/mount.dev-shm/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.dev-mqueue/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/core/mount.dev-shm/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/mount.dev-mqueue/flag-essential diff --git a/main/nnd-s6-services/rc/net/dir.var-empty/type b/main/nnd-s6-services/rc/mount.dev-mqueue/type similarity index 100% rename from main/nnd-s6-services/rc/net/dir.var-empty/type rename to main/nnd-s6-services/rc/mount.dev-mqueue/type diff --git a/main/nnd-s6-services/rc/core/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up similarity index 70% rename from main/nnd-s6-services/rc/core/mount.dev-mqueue/up rename to main/nnd-s6-services/rc/mount.dev-mqueue/up index 99b55a6..3b85b84 100644 --- a/main/nnd-s6-services/rc/core/mount.dev-mqueue/up +++ b/main/nnd-s6-services/rc/mount.dev-mqueue/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.dev-mqueue +s6-envdir -i /etc/s6/env/mount.dev-mqueue importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS mqueue $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS mqueue $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/desktop/udevd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.dev-pts/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/mount.dev-pts/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/mount.dev-pts/down b/main/nnd-s6-services/rc/mount.dev-pts/down new file mode 100644 index 0000000..f50b468 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.dev-pts/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/pts + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/dependencies.d/mount.sys b/main/nnd-s6-services/rc/mount.dev-pts/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys-firmware-efi-efivars/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/mount.dev-pts/flag-essential diff --git a/main/nnd-s6-services/rc/net/interface.br0.link/type b/main/nnd-s6-services/rc/mount.dev-pts/type similarity index 100% rename from main/nnd-s6-services/rc/net/interface.br0.link/type rename to main/nnd-s6-services/rc/mount.dev-pts/type diff --git a/main/nnd-s6-services/rc/core/mount.dev-pts/up b/main/nnd-s6-services/rc/mount.dev-pts/up similarity index 71% rename from main/nnd-s6-services/rc/core/mount.dev-pts/up rename to main/nnd-s6-services/rc/mount.dev-pts/up index b08611f..c5d75b2 100644 --- a/main/nnd-s6-services/rc/core/mount.dev-pts/up +++ b/main/nnd-s6-services/rc/mount.dev-pts/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.dev-pts +s6-envdir -i /etc/s6/env/mount.dev-pts importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS pts $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS pts $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mount.dev b/main/nnd-s6-services/rc/mount.dev-shm/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mount.dev rename to main/nnd-s6-services/rc/mount.dev-shm/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/mount.dev-shm/down b/main/nnd-s6-services/rc/mount.dev-shm/down new file mode 100644 index 0000000..2190a57 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.dev-shm/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/shm + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/core/mount.sys-fs-pstore/dependencies.d/mount.sys b/main/nnd-s6-services/rc/mount.dev-shm/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys-fs-pstore/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/mount.dev-shm/flag-essential diff --git a/main/nnd-s6-services/rc/net/interface.eth0.link/type b/main/nnd-s6-services/rc/mount.dev-shm/type similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.link/type rename to main/nnd-s6-services/rc/mount.dev-shm/type diff --git a/main/nnd-s6-services/rc/core/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up similarity index 71% rename from main/nnd-s6-services/rc/core/mount.dev-shm/up rename to main/nnd-s6-services/rc/mount.dev-shm/up index 0413477..a83e9dd 100644 --- a/main/nnd-s6-services/rc/core/mount.dev-shm/up +++ b/main/nnd-s6-services/rc/mount.dev-shm/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.dev-shm +s6-envdir -i /etc/s6/env/mount.dev-shm importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS shm $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS shm $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/mount.dev/down b/main/nnd-s6-services/rc/mount.dev/down new file mode 100644 index 0000000..5e825d4 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.dev/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 + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/core/mount.sys-kernel-security/dependencies.d/mount.sys b/main/nnd-s6-services/rc/mount.dev/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/core/mount.sys-kernel-security/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/mount.dev/flag-essential diff --git a/main/nnd-s6-services/rc/net/interface.eth0.ready/type b/main/nnd-s6-services/rc/mount.dev/type similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.ready/type rename to main/nnd-s6-services/rc/mount.dev/type diff --git a/main/nnd-s6-services/rc/core/mount.dev/up b/main/nnd-s6-services/rc/mount.dev/up similarity index 71% rename from main/nnd-s6-services/rc/core/mount.dev/up rename to main/nnd-s6-services/rc/mount.dev/up index 5e21fb8..ae086e6 100644 --- a/main/nnd-s6-services/rc/core/mount.dev/up +++ b/main/nnd-s6-services/rc/mount.dev/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.dev +s6-envdir -i /etc/s6/env/mount.dev importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS devtmpfs $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS devtmpfs $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/mount.proc/down b/main/nnd-s6-services/rc/mount.proc/down new file mode 100644 index 0000000..9360985 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.proc/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 /proc + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/core/syslogd/dependencies.d/hostname b/main/nnd-s6-services/rc/mount.proc/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/core/syslogd/dependencies.d/hostname rename to main/nnd-s6-services/rc/mount.proc/flag-essential diff --git a/main/nnd-s6-services/rc/net/interface.lo.link/type b/main/nnd-s6-services/rc/mount.proc/type similarity index 100% rename from main/nnd-s6-services/rc/net/interface.lo.link/type rename to main/nnd-s6-services/rc/mount.proc/type diff --git a/main/nnd-s6-services/rc/core/mount.proc/up b/main/nnd-s6-services/rc/mount.proc/up similarity index 71% rename from main/nnd-s6-services/rc/core/mount.proc/up rename to main/nnd-s6-services/rc/mount.proc/up index 24b5ded..ed95d91 100644 --- a/main/nnd-s6-services/rc/core/mount.proc/up +++ b/main/nnd-s6-services/rc/mount.proc/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.proc +s6-envdir -i /etc/s6/env/mount.proc importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS procfs $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS procfs $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/mount.root/down b/main/nnd-s6-services/rc/mount.root/down new file mode 100644 index 0000000..e798d26 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.root/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 / + +fdclose 1 +fdclose 2 + +exec mount -o remount,ro none $DEST diff --git a/main/nnd-s6-services/rc/net/module.bridge/type b/main/nnd-s6-services/rc/mount.root/type similarity index 100% rename from main/nnd-s6-services/rc/net/module.bridge/type rename to main/nnd-s6-services/rc/mount.root/type diff --git a/main/nnd-s6-services/rc/core/mount.root/up b/main/nnd-s6-services/rc/mount.root/up similarity index 100% rename from main/nnd-s6-services/rc/core/mount.root/up rename to main/nnd-s6-services/rc/mount.root/up diff --git a/main/nnd-s6-services/rc/mount.run/down b/main/nnd-s6-services/rc/mount.run/down new file mode 100644 index 0000000..911f36b --- /dev/null +++ b/main/nnd-s6-services/rc/mount.run/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 /run + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/desktop/udevd.settle/dependencies.d/udevd.trigger b/main/nnd-s6-services/rc/mount.run/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd.settle/dependencies.d/udevd.trigger rename to main/nnd-s6-services/rc/mount.run/flag-essential diff --git a/main/nnd-s6-services/rc/net/module.ipv6/type b/main/nnd-s6-services/rc/mount.run/type similarity index 100% rename from main/nnd-s6-services/rc/net/module.ipv6/type rename to main/nnd-s6-services/rc/mount.run/type diff --git a/main/nnd-s6-services/rc/mount.run/up b/main/nnd-s6-services/rc/mount.run/up new file mode 100644 index 0000000..34a5903 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.run/up @@ -0,0 +1,21 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +s6-envdir -i /etc/s6/env/mount.run +importas -i OPTS OPTS +emptyenv + +export PATH $PATH +define DEST /run +define FSTYPE tmpfs + +fdclose 1 +fdclose 2 + +foreground { + foreground { + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS run $DEST +} if -nt { + importas status ? test $status -eq 1 +} diff --git a/main/nnd-s6-services/rc/desktop/udevd/dependencies.d/mount.sys b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/dependencies.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/dependencies.d/mount.sys diff --git a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down new file mode 100644 index 0000000..eca3ad6 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/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 /sys/firmware/efi/efivars + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/desktop/udevd.trigger/dependencies.d/udevd b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd.trigger/dependencies.d/udevd rename to main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/flag-essential diff --git a/main/nnd-s6-services/rc/net/nftables/type b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/type similarity index 100% rename from main/nnd-s6-services/rc/net/nftables/type rename to main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/type 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 new file mode 100644 index 0000000..122d319 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up @@ -0,0 +1,21 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars +importas -i OPTS OPTS +emptyenv + +export PATH $PATH +define DEST /sys/firmware/efi/efivars +define FSTYPE efivarfs + +fdclose 1 +fdclose 2 + +foreground { + foreground { + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS securityfs $DEST +} if -nt { + importas status ? test $status -eq 1 +} diff --git a/main/nnd-s6-services/rc/desktop/xorg.0/dependencies.d/udevd.settle b/main/nnd-s6-services/rc/mount.sys-fs-pstore/dependencies.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/desktop/xorg.0/dependencies.d/udevd.settle rename to main/nnd-s6-services/rc/mount.sys-fs-pstore/dependencies.d/mount.sys diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/down b/main/nnd-s6-services/rc/mount.sys-fs-pstore/down new file mode 100644 index 0000000..9723115 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/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 /sys/fs/pstore + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/module.tun b/main/nnd-s6-services/rc/mount.sys-fs-pstore/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/module.tun rename to main/nnd-s6-services/rc/mount.sys-fs-pstore/flag-essential diff --git a/main/nnd-s6-services/rc/net/sshd.keygen/type b/main/nnd-s6-services/rc/mount.sys-fs-pstore/type similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.keygen/type rename to main/nnd-s6-services/rc/mount.sys-fs-pstore/type diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up new file mode 100644 index 0000000..97e569a --- /dev/null +++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up @@ -0,0 +1,21 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +s6-envdir -i /etc/s6/env/mount.sys-fs-pstore +importas -i OPTS OPTS +emptyenv + +export PATH $PATH +define DEST /sys/fs/pstore +define FSTYPE pstore + +fdclose 1 +fdclose 2 + +foreground { + foreground { + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS securityfs $DEST +} if -nt { + importas status ? test $status -eq 1 +} diff --git a/main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/virtlockd b/main/nnd-s6-services/rc/mount.sys-kernel-security/dependencies.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/mount.sys-kernel-security/dependencies.d/mount.sys diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/down b/main/nnd-s6-services/rc/mount.sys-kernel-security/down new file mode 100644 index 0000000..8fb60f8 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/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 /sys/kernel/security + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/virtlogd b/main/nnd-s6-services/rc/mount.sys-kernel-security/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtinterfaced/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/mount.sys-kernel-security/flag-essential diff --git a/main/nnd-s6-services/rc/net/user.sshd/type b/main/nnd-s6-services/rc/mount.sys-kernel-security/type similarity index 100% rename from main/nnd-s6-services/rc/net/user.sshd/type rename to main/nnd-s6-services/rc/mount.sys-kernel-security/type diff --git a/main/nnd-s6-services/rc/core/mount.sys-kernel-security/up b/main/nnd-s6-services/rc/mount.sys-kernel-security/up similarity index 69% rename from main/nnd-s6-services/rc/core/mount.sys-kernel-security/up rename to main/nnd-s6-services/rc/mount.sys-kernel-security/up index 163c785..091a186 100644 --- a/main/nnd-s6-services/rc/core/mount.sys-kernel-security/up +++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.sys-kernel-security +s6-envdir -i /etc/s6/env/mount.sys-kernel-security importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS securityfs $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS securityfs $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/mount.sys/down b/main/nnd-s6-services/rc/mount.sys/down new file mode 100644 index 0000000..e321839 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.sys/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 /sys + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/libvirt/virtlogd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/mount.sys/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlogd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/mount.sys/flag-essential diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/type b/main/nnd-s6-services/rc/mount.sys/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.create/type rename to main/nnd-s6-services/rc/mount.sys/type diff --git a/main/nnd-s6-services/rc/core/mount.sys/up b/main/nnd-s6-services/rc/mount.sys/up similarity index 71% rename from main/nnd-s6-services/rc/core/mount.sys/up rename to main/nnd-s6-services/rc/mount.sys/up index ed2eb6b..7013fc3 100644 --- a/main/nnd-s6-services/rc/core/mount.sys/up +++ b/main/nnd-s6-services/rc/mount.sys/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/core/mount.sys +s6-envdir -i /etc/s6/env/mount.sys importas -i OPTS OPTS emptyenv @@ -14,8 +14,8 @@ fdclose 2 foreground { foreground { - mkdir -p $DEST - } mount -t $FSTYPE -o $OPTS sysfs $DEST + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS sysfs $DEST } if -nt { importas status ? test $status -eq 1 } diff --git a/main/nnd-s6-services/rc/mount.tmp/down b/main/nnd-s6-services/rc/mount.tmp/down new file mode 100644 index 0000000..17549f0 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.tmp/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 /tmp + +fdclose 1 +fdclose 2 + +exec umount $DEST diff --git a/main/nnd-s6-services/rc/libvirt/virtlxcd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/mount.tmp/flag-essential similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlxcd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/mount.tmp/flag-essential diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/type b/main/nnd-s6-services/rc/mount.tmp/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.link/type rename to main/nnd-s6-services/rc/mount.tmp/type diff --git a/main/nnd-s6-services/rc/mount.tmp/up b/main/nnd-s6-services/rc/mount.tmp/up new file mode 100644 index 0000000..9ae65a6 --- /dev/null +++ b/main/nnd-s6-services/rc/mount.tmp/up @@ -0,0 +1,21 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +s6-envdir -i /etc/s6/env/mount.tmp +importas -i OPTS OPTS +emptyenv + +export PATH $PATH +define DEST /tmp +define FSTYPE tmpfs + +fdclose 1 +fdclose 2 + +foreground { + foreground { + exec mkdir -p $DEST + } exec mount -t $FSTYPE -o $OPTS tmp $DEST +} if -nt { + importas status ? test $status -eq 1 +} diff --git a/main/nnd-s6-services/rc/net/nftables/down b/main/nnd-s6-services/rc/nftables/down similarity index 100% rename from main/nnd-s6-services/rc/net/nftables/down rename to main/nnd-s6-services/rc/nftables/down diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/type b/main/nnd-s6-services/rc/nftables/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.4/type rename to main/nnd-s6-services/rc/nftables/type diff --git a/main/nnd-s6-services/rc/net/nftables/up b/main/nnd-s6-services/rc/nftables/up similarity index 100% rename from main/nnd-s6-services/rc/net/nftables/up rename to main/nnd-s6-services/rc/nftables/up diff --git a/main/nnd-s6-services/rc/net/ntpd.1/producer-for b/main/nnd-s6-services/rc/ntpd.1/producer-for similarity index 100% rename from main/nnd-s6-services/rc/net/ntpd.1/producer-for rename to main/nnd-s6-services/rc/ntpd.1/producer-for diff --git a/main/nnd-s6-services/rc/net/ntpd.1/run b/main/nnd-s6-services/rc/ntpd.1/run similarity index 100% rename from main/nnd-s6-services/rc/net/ntpd.1/run rename to main/nnd-s6-services/rc/ntpd.1/run diff --git a/main/nnd-s6-services/rc/libvirt/virtinterfaced/type b/main/nnd-s6-services/rc/ntpd.1/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtinterfaced/type rename to main/nnd-s6-services/rc/ntpd.1/type diff --git a/main/nnd-s6-services/rc/libvirt/virtnodedevd/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/qemu-ga/dependencies.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnodedevd/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/qemu-ga/dependencies.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/libvirt/virtlxcd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/qemu-ga/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlxcd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/qemu-ga/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/producer-for b/main/nnd-s6-services/rc/qemu-ga/producer-for similarity index 100% rename from main/nnd-s6-services/rc/virtual/qemu-ga/producer-for rename to main/nnd-s6-services/rc/qemu-ga/producer-for diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/run b/main/nnd-s6-services/rc/qemu-ga/run similarity index 100% rename from main/nnd-s6-services/rc/virtual/qemu-ga/run rename to main/nnd-s6-services/rc/qemu-ga/run diff --git a/main/nnd-s6-services/rc/libvirt/virtlockd/type b/main/nnd-s6-services/rc/qemu-ga/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlockd/type rename to main/nnd-s6-services/rc/qemu-ga/type diff --git a/main/nnd-s6-services/rc/net/sshd.1/dependencies.d/dir.var-empty b/main/nnd-s6-services/rc/sshd.1/dependencies.d/dir.var-empty similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/dependencies.d/dir.var-empty rename to main/nnd-s6-services/rc/sshd.1/dependencies.d/dir.var-empty diff --git a/main/nnd-s6-services/rc/net/sshd.1/dependencies.d/mount.dev-pts b/main/nnd-s6-services/rc/sshd.1/dependencies.d/mount.dev-pts similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/dependencies.d/mount.dev-pts rename to main/nnd-s6-services/rc/sshd.1/dependencies.d/mount.dev-pts diff --git a/main/nnd-s6-services/rc/net/sshd.1/dependencies.d/sshd.keygen b/main/nnd-s6-services/rc/sshd.1/dependencies.d/sshd.keygen similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/dependencies.d/sshd.keygen rename to main/nnd-s6-services/rc/sshd.1/dependencies.d/sshd.keygen diff --git a/main/nnd-s6-services/rc/net/sshd.1/dependencies.d/user.sshd b/main/nnd-s6-services/rc/sshd.1/dependencies.d/user.sshd similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/dependencies.d/user.sshd rename to main/nnd-s6-services/rc/sshd.1/dependencies.d/user.sshd diff --git a/main/nnd-s6-services/rc/net/sshd.1/dependencies.d/utmpd b/main/nnd-s6-services/rc/sshd.1/dependencies.d/utmpd similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/dependencies.d/utmpd rename to main/nnd-s6-services/rc/sshd.1/dependencies.d/utmpd diff --git a/main/nnd-s6-services/rc/net/sshd.1/producer-for b/main/nnd-s6-services/rc/sshd.1/producer-for similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/producer-for rename to main/nnd-s6-services/rc/sshd.1/producer-for diff --git a/main/nnd-s6-services/rc/net/sshd.1/run b/main/nnd-s6-services/rc/sshd.1/run similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/run rename to main/nnd-s6-services/rc/sshd.1/run diff --git a/main/nnd-s6-services/rc/libvirt/virtlogd/type b/main/nnd-s6-services/rc/sshd.1/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlogd/type rename to main/nnd-s6-services/rc/sshd.1/type diff --git a/main/nnd-s6-services/rc/libvirt/virtstoraged/dependencies.d/mount.root b/main/nnd-s6-services/rc/sshd.keygen/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtstoraged/dependencies.d/mount.root rename to main/nnd-s6-services/rc/sshd.keygen/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/type b/main/nnd-s6-services/rc/sshd.keygen/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.addr.6/type rename to main/nnd-s6-services/rc/sshd.keygen/type diff --git a/main/nnd-s6-services/rc/net/sshd.keygen/up b/main/nnd-s6-services/rc/sshd.keygen/up similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.keygen/up rename to main/nnd-s6-services/rc/sshd.keygen/up diff --git a/main/nnd-s6-services/rc/libvirt/virtnetworkd/dependencies.d/module.tun b/main/nnd-s6-services/rc/syslogd/dependencies.d/hostname similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnetworkd/dependencies.d/module.tun rename to main/nnd-s6-services/rc/syslogd/dependencies.d/hostname diff --git a/main/nnd-s6-services/rc/net/logger.udhcpc/notification-fd b/main/nnd-s6-services/rc/syslogd/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/net/logger.udhcpc/notification-fd rename to main/nnd-s6-services/rc/syslogd/notification-fd diff --git a/main/nnd-s6-services/rc/core/syslogd/producer-for b/main/nnd-s6-services/rc/syslogd/producer-for similarity index 100% rename from main/nnd-s6-services/rc/core/syslogd/producer-for rename to main/nnd-s6-services/rc/syslogd/producer-for diff --git a/main/nnd-s6-services/rc/core/syslogd/run b/main/nnd-s6-services/rc/syslogd/run similarity index 100% rename from main/nnd-s6-services/rc/core/syslogd/run rename to main/nnd-s6-services/rc/syslogd/run diff --git a/main/nnd-s6-services/rc/libvirt/virtlxcd/type b/main/nnd-s6-services/rc/syslogd/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlxcd/type rename to main/nnd-s6-services/rc/syslogd/type diff --git a/main/nnd-s6-services/rc/libvirt/virtnetworkd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/udevd.settle/dependencies.d/udevd.trigger similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnetworkd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/udevd.settle/dependencies.d/udevd.trigger diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/type b/main/nnd-s6-services/rc/udevd.settle/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.4/type rename to main/nnd-s6-services/rc/udevd.settle/type diff --git a/main/nnd-s6-services/rc/desktop/udevd.settle/up b/main/nnd-s6-services/rc/udevd.settle/up similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd.settle/up rename to main/nnd-s6-services/rc/udevd.settle/up diff --git a/main/nnd-s6-services/rc/libvirt/virtnetworkd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/udevd.trigger/dependencies.d/udevd similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnetworkd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/udevd.trigger/dependencies.d/udevd diff --git a/main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/type b/main/nnd-s6-services/rc/udevd.trigger/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/interface.wg-tunnel.static.route.6/type rename to main/nnd-s6-services/rc/udevd.trigger/type diff --git a/main/nnd-s6-services/rc/desktop/udevd.trigger/up b/main/nnd-s6-services/rc/udevd.trigger/up similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd.trigger/up rename to main/nnd-s6-services/rc/udevd.trigger/up diff --git a/main/nnd-s6-services/rc/libvirt/virtnodedevd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/udevd/dependencies.d/mount.dev similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnodedevd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/udevd/dependencies.d/mount.dev diff --git a/main/nnd-s6-services/rc/libvirt/virtnodedevd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/udevd/dependencies.d/mount.sys similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnodedevd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/udevd/dependencies.d/mount.sys diff --git a/main/nnd-s6-services/rc/desktop/udevd/producer-for b/main/nnd-s6-services/rc/udevd/producer-for similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd/producer-for rename to main/nnd-s6-services/rc/udevd/producer-for diff --git a/main/nnd-s6-services/rc/desktop/udevd/run b/main/nnd-s6-services/rc/udevd/run similarity index 100% rename from main/nnd-s6-services/rc/desktop/udevd/run rename to main/nnd-s6-services/rc/udevd/run diff --git a/main/nnd-s6-services/rc/libvirt/virtnetworkd/type b/main/nnd-s6-services/rc/udevd/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnetworkd/type rename to main/nnd-s6-services/rc/udevd/type diff --git a/main/nnd-s6-services/rc/net/udhcpc.br0/dependencies.d/interface.br0.link b/main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/interface.br0.link similarity index 100% rename from main/nnd-s6-services/rc/net/udhcpc.br0/dependencies.d/interface.br0.link rename to main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/interface.br0.link diff --git a/main/nnd-s6-services/rc/net/udhcpc.br0/dependencies.d/syslogd b/main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/syslogd similarity index 100% rename from main/nnd-s6-services/rc/net/udhcpc.br0/dependencies.d/syslogd rename to main/nnd-s6-services/rc/udhcpc.br0/dependencies.d/syslogd diff --git a/main/nnd-s6-services/rc/net/udhcpc.br0/producer-for b/main/nnd-s6-services/rc/udhcpc.br0/producer-for similarity index 100% rename from main/nnd-s6-services/rc/net/udhcpc.br0/producer-for rename to main/nnd-s6-services/rc/udhcpc.br0/producer-for diff --git a/main/nnd-s6-services/rc/net/udhcpc.br0/run b/main/nnd-s6-services/rc/udhcpc.br0/run similarity index 100% rename from main/nnd-s6-services/rc/net/udhcpc.br0/run rename to main/nnd-s6-services/rc/udhcpc.br0/run diff --git a/main/nnd-s6-services/rc/libvirt/virtnodedevd/type b/main/nnd-s6-services/rc/udhcpc.br0/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnodedevd/type rename to main/nnd-s6-services/rc/udhcpc.br0/type diff --git a/main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/type b/main/nnd-s6-services/rc/user.sshd/type similarity index 100% rename from main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/type rename to main/nnd-s6-services/rc/user.sshd/type diff --git a/main/nnd-s6-services/rc/net/user.sshd/up b/main/nnd-s6-services/rc/user.sshd/up similarity index 100% rename from main/nnd-s6-services/rc/net/user.sshd/up rename to main/nnd-s6-services/rc/user.sshd/up diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/utmpd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/virtual/logger.qemu-ga/dependencies.d/dir.var-log rename to main/nnd-s6-services/rc/utmpd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/net/dir.var-empty/dependencies.d/mount.root b/main/nnd-s6-services/rc/utmpd/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/net/dir.var-empty/dependencies.d/mount.root rename to main/nnd-s6-services/rc/utmpd/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/core/utmpd/run b/main/nnd-s6-services/rc/utmpd/run similarity index 100% rename from main/nnd-s6-services/rc/core/utmpd/run rename to main/nnd-s6-services/rc/utmpd/run diff --git a/main/nnd-s6-services/rc/libvirt/virtproxyd/type b/main/nnd-s6-services/rc/utmpd/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtproxyd/type rename to main/nnd-s6-services/rc/utmpd/type diff --git a/main/nnd-s6-services/rc/net/interface.eth0.ready/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/vg.Backplane/dependencies.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/net/interface.eth0.ready/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/vg.Backplane/dependencies.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/libvirt/virtproxyd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/vg.Backplane/dependencies.d/module.dm-mod similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtproxyd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/vg.Backplane/dependencies.d/module.dm-mod diff --git a/main/nnd-s6-services/rc/vg.Backplane/down b/main/nnd-s6-services/rc/vg.Backplane/down new file mode 100644 index 0000000..8757f02 --- /dev/null +++ b/main/nnd-s6-services/rc/vg.Backplane/down @@ -0,0 +1,12 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +emptyenv + +export PATH $PATH +define VG Backplane + +fdclose 1 +fdclose 2 + +exec vgchange -a n $VG diff --git a/main/nnd-s6-services/rc/vg.Backplane/type b/main/nnd-s6-services/rc/vg.Backplane/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/vg.Backplane/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/vg.Backplane/up b/main/nnd-s6-services/rc/vg.Backplane/up new file mode 100644 index 0000000..2a94f84 --- /dev/null +++ b/main/nnd-s6-services/rc/vg.Backplane/up @@ -0,0 +1,12 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +importas -i PATH PATH +emptyenv + +export PATH $PATH +define VG Backplane + +fdclose 1 +fdclose 2 + +exec vgchange -a y $VG diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/virtual/qemu-ga/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/virtinterfaced/dependencies.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/libvirt/virtproxyd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/module.tun similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtproxyd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/virtinterfaced/dependencies.d/module.tun diff --git a/main/nnd-s6-services/rc/libvirt/virtqemud/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlockd similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtqemud/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlockd diff --git a/main/nnd-s6-services/rc/libvirt/virtqemud/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlogd similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtqemud/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlogd diff --git a/main/nnd-s6-services/rc/libvirt/virtinterfaced/run b/main/nnd-s6-services/rc/virtinterfaced/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtinterfaced/run rename to main/nnd-s6-services/rc/virtinterfaced/run diff --git a/main/nnd-s6-services/rc/libvirt/virtqemud/type b/main/nnd-s6-services/rc/virtinterfaced/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtqemud/type rename to main/nnd-s6-services/rc/virtinterfaced/type diff --git a/main/nnd-s6-services/rc/libvirt/virtstoraged/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtlockd/dependencies.d/dir.var-lock similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtstoraged/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/virtlockd/dependencies.d/dir.var-lock diff --git a/main/nnd-s6-services/rc/net/sshd.keygen/dependencies.d/mount.root b/main/nnd-s6-services/rc/virtlockd/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.keygen/dependencies.d/mount.root rename to main/nnd-s6-services/rc/virtlockd/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/libvirt/virtlockd/run b/main/nnd-s6-services/rc/virtlockd/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlockd/run rename to main/nnd-s6-services/rc/virtlockd/run diff --git a/main/nnd-s6-services/rc/libvirt/virtstoraged/type b/main/nnd-s6-services/rc/virtlockd/type similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtstoraged/type rename to main/nnd-s6-services/rc/virtlockd/type diff --git a/main/nnd-s6-services/rc/libvirt/virtstoraged/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtlogd/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtstoraged/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/virtlogd/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/dependencies.d/interface.wg-tunnel.create b/main/nnd-s6-services/rc/virtlogd/dependencies.d/virtlockd similarity index 100% rename from main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/dependencies.d/interface.wg-tunnel.create rename to main/nnd-s6-services/rc/virtlogd/dependencies.d/virtlockd diff --git a/main/nnd-s6-services/rc/libvirt/virtlogd/run b/main/nnd-s6-services/rc/virtlogd/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlogd/run rename to main/nnd-s6-services/rc/virtlogd/run diff --git a/main/nnd-s6-services/rc/net/logger.ntpd/type b/main/nnd-s6-services/rc/virtlogd/type similarity index 100% rename from main/nnd-s6-services/rc/net/logger.ntpd/type rename to main/nnd-s6-services/rc/virtlogd/type diff --git a/main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlockd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlogd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/libvirt/virtlxcd/run b/main/nnd-s6-services/rc/virtlxcd/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtlxcd/run rename to main/nnd-s6-services/rc/virtlxcd/run diff --git a/main/nnd-s6-services/rc/net/logger.sshd/type b/main/nnd-s6-services/rc/virtlxcd/type similarity index 100% rename from main/nnd-s6-services/rc/net/logger.sshd/type rename to main/nnd-s6-services/rc/virtlxcd/type diff --git a/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/module.tun b/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/module.tun new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlockd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlogd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/libvirt/virtnetworkd/run b/main/nnd-s6-services/rc/virtnetworkd/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnetworkd/run rename to main/nnd-s6-services/rc/virtnetworkd/run diff --git a/main/nnd-s6-services/rc/net/logger.udhcpc/type b/main/nnd-s6-services/rc/virtnetworkd/type similarity index 100% rename from main/nnd-s6-services/rc/net/logger.udhcpc/type rename to main/nnd-s6-services/rc/virtnetworkd/type diff --git a/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/mdevd.coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlockd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlogd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/libvirt/virtnodedevd/run b/main/nnd-s6-services/rc/virtnodedevd/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtnodedevd/run rename to main/nnd-s6-services/rc/virtnodedevd/run diff --git a/main/nnd-s6-services/rc/net/ntpd.1/type b/main/nnd-s6-services/rc/virtnodedevd/type similarity index 100% rename from main/nnd-s6-services/rc/net/ntpd.1/type rename to main/nnd-s6-services/rc/virtnodedevd/type diff --git a/main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlockd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlogd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/libvirt/virtproxyd/run b/main/nnd-s6-services/rc/virtproxyd/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtproxyd/run rename to main/nnd-s6-services/rc/virtproxyd/run diff --git a/main/nnd-s6-services/rc/net/sshd.1/type b/main/nnd-s6-services/rc/virtproxyd/type similarity index 100% rename from main/nnd-s6-services/rc/net/sshd.1/type rename to main/nnd-s6-services/rc/virtproxyd/type diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlockd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlogd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/libvirt/virtqemud/run b/main/nnd-s6-services/rc/virtqemud/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtqemud/run rename to main/nnd-s6-services/rc/virtqemud/run diff --git a/main/nnd-s6-services/rc/net/udhcpc.br0/type b/main/nnd-s6-services/rc/virtqemud/type similarity index 100% rename from main/nnd-s6-services/rc/net/udhcpc.br0/type rename to main/nnd-s6-services/rc/virtqemud/type diff --git a/main/nnd-s6-services/rc/virtstoraged/dependencies.d/mount.root b/main/nnd-s6-services/rc/virtstoraged/dependencies.d/mount.root new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlockd b/main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlockd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlogd b/main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlogd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/libvirt/virtstoraged/run b/main/nnd-s6-services/rc/virtstoraged/run similarity index 100% rename from main/nnd-s6-services/rc/libvirt/virtstoraged/run rename to main/nnd-s6-services/rc/virtstoraged/run diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/type b/main/nnd-s6-services/rc/virtstoraged/type similarity index 100% rename from main/nnd-s6-services/rc/virtual/logger.qemu-ga/type rename to main/nnd-s6-services/rc/virtstoraged/type 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 new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/wg-config.wg-tunnel/type b/main/nnd-s6-services/rc/wg-config.wg-tunnel/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/wg-config.wg-tunnel/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/up b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up similarity index 80% rename from main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/up rename to main/nnd-s6-services/rc/wg-config.wg-tunnel/up index 4326fcd..8d3d0ad 100644 --- a/main/nnd-s6-services/rc/tunnel/wg-config.wg-tunnel/up +++ b/main/nnd-s6-services/rc/wg-config.wg-tunnel/up @@ -1,7 +1,7 @@ #!/bin/execlineb -P s6-envdir -i /etc/s6/env/path importas -i PATH PATH -s6-envdir -i /etc/s6/env/tunnel/wg-config.wg-tunnel +s6-envdir -i /etc/s6/env/wg-config.wg-tunnel importas -i CONFIG CONFIG emptyenv diff --git a/main/nnd-s6-services/rc/xorg.0/dependencies.d/udevd.settle b/main/nnd-s6-services/rc/xorg.0/dependencies.d/udevd.settle new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtual/logger.qemu-ga/notification-fd b/main/nnd-s6-services/rc/xorg.0/notification-fd similarity index 100% rename from main/nnd-s6-services/rc/virtual/logger.qemu-ga/notification-fd rename to main/nnd-s6-services/rc/xorg.0/notification-fd diff --git a/main/nnd-s6-services/rc/desktop/xorg.0/producer-for b/main/nnd-s6-services/rc/xorg.0/producer-for similarity index 100% rename from main/nnd-s6-services/rc/desktop/xorg.0/producer-for rename to main/nnd-s6-services/rc/xorg.0/producer-for diff --git a/main/nnd-s6-services/rc/desktop/xorg.0/run b/main/nnd-s6-services/rc/xorg.0/run similarity index 100% rename from main/nnd-s6-services/rc/desktop/xorg.0/run rename to main/nnd-s6-services/rc/xorg.0/run diff --git a/main/nnd-s6-services/rc/virtual/qemu-ga/type b/main/nnd-s6-services/rc/xorg.0/type similarity index 100% rename from main/nnd-s6-services/rc/virtual/qemu-ga/type rename to main/nnd-s6-services/rc/xorg.0/type