From 207ac183a4b130b7a3dc62526595a79ebbef4557 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Wed, 14 Feb 2024 13:19:42 +0000 Subject: [PATCH] Bump s6 services and prepare XDG stuff --- main/nnd-s6-linux-init/APKBUILD | 3 ++- main/nnd-s6-services/APKBUILD | 7 +++--- main/nnd-s6-services/env/path/PATH | 1 - main/nnd-s6-services/env/xdg/HOME | 1 - main/nnd-s6-services/env/xdg/XDG_CACHE_HOME | 1 - main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME | 1 - main/nnd-s6-services/env/xdg/XDG_DATA_HOME | 1 - main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR | 1 - main/nnd-s6-services/env/xdg/XDG_STATE_HOME | 1 - main/nnd-s6-services/manage.sh | 22 +++++++++++++++++-- main/nnd-s6-services/rc/bird/run | 7 +++--- .../contents.d/interface.lo.create} | 0 .../rc/bundle.interface.lo.configure/type | 1 + .../contents.d/interface.lo.link | 0 .../rc/bundle.interface.lo.ready/type | 1 + .../contents.d/bundle.interface.lo.configure | 0 .../contents.d/bundle.interface.lo.ready | 0 .../rc/bundle.interface.lo/type | 1 + .../bundle.net/contents.d/bundle.interface.lo | 0 main/nnd-s6-services/rc/ceph-exporter/run | 3 --- main/nnd-s6-services/rc/ceph.osd.0.block/up | 7 +++--- .../rc/ceph.osd.0.bluestore-primer/up | 6 ++--- main/nnd-s6-services/rc/clock.hw/up | 3 --- main/nnd-s6-services/rc/dbus/run | 3 --- main/nnd-s6-services/rc/dmeventd/producer-for | 1 + main/nnd-s6-services/rc/dmeventd/run | 5 ++--- main/nnd-s6-services/rc/gortr/run | 7 +++--- main/nnd-s6-services/rc/group.seat/up | 3 --- .../interface.br0.bridge.mcast_mld_version/up | 2 -- .../interface.br0.bridge.mcast_querier/down | 2 -- .../rc/interface.br0.bridge.mcast_querier/up | 2 -- .../rc/interface.br0.bridge.mcast_router/down | 2 -- .../rc/interface.br0.bridge.mcast_router/up | 2 -- .../rc/interface.br0.bridge.mcast_snooping/up | 2 -- .../rc/interface.br0.create/down | 2 -- .../rc/interface.br0.create/up | 2 -- .../nnd-s6-services/rc/interface.br0.dhcp/run | 2 -- .../rc/interface.br0.link/down | 2 -- main/nnd-s6-services/rc/interface.br0.link/up | 2 -- .../rc/interface.br0.slave.eth0/down | 2 -- .../rc/interface.br0.slave.eth0/up | 2 -- .../rc/interface.eth0.create/up | 2 -- .../rc/interface.eth0.link/down | 2 -- .../nnd-s6-services/rc/interface.eth0.link/up | 2 -- .../dependencies.d/bundle.hw-coldplug | 0 .../rc/interface.lo.create/type | 1 + .../nnd-s6-services/rc/interface.lo.create/up | 3 +++ .../bundle.interface.lo.configure | 0 .../nnd-s6-services/rc/interface.lo.link/down | 4 ---- main/nnd-s6-services/rc/interface.lo.link/up | 4 ---- main/nnd-s6-services/rc/irqbalance/run | 7 +++--- main/nnd-s6-services/rc/klogd/run | 3 --- main/nnd-s6-services/rc/kmod.sysfs/up | 3 --- main/nnd-s6-services/rc/libvirt.stopall/down | 3 --- main/nnd-s6-services/rc/lldpd/run | 3 --- .../rc/logger.dmeventd/consumer-for | 1 + .../dependencies.d/dir.var-log | 0 .../rc/logger.dmeventd/notification-fd | 1 + main/nnd-s6-services/rc/logger.dmeventd/run | 4 ++++ main/nnd-s6-services/rc/logger.dmeventd/type | 1 + .../rc/logger.pipewire/consumer-for | 3 +++ .../dependencies.d/dir.var-log | 0 .../rc/logger.pipewire/notification-fd | 1 + main/nnd-s6-services/rc/logger.pipewire/run | 4 ++++ main/nnd-s6-services/rc/logger.pipewire/type | 1 + main/nnd-s6-services/rc/lxd/run | 4 ---- main/nnd-s6-services/rc/machineid/up | 3 --- main/nnd-s6-services/rc/mdevd.coldplug/up | 3 --- main/nnd-s6-services/rc/mdevd/run | 6 ++--- main/nnd-s6-services/rc/mount.boot-efi/up | 4 +++- main/nnd-s6-services/rc/mount.boot/up | 4 +++- .../nnd-s6-services/rc/mount.dev-hugepages/up | 4 +++- main/nnd-s6-services/rc/mount.dev-mqueue/up | 4 +++- main/nnd-s6-services/rc/mount.dev-pts/up | 4 +++- main/nnd-s6-services/rc/mount.dev-shm/up | 4 +++- main/nnd-s6-services/rc/mount.dev/up | 4 +++- .../rc/mount.proc-sys-fs-binfmt_misc/up | 4 +++- main/nnd-s6-services/rc/mount.proc/up | 4 +++- main/nnd-s6-services/rc/mount.root/up | 4 +++- main/nnd-s6-services/rc/mount.run/up | 4 +++- .../rc/mount.sys-firmware-efi-efivars/up | 4 +++- .../nnd-s6-services/rc/mount.sys-fs-cgroup/up | 4 +++- .../nnd-s6-services/rc/mount.sys-fs-pstore/up | 4 +++- .../rc/mount.sys-kernel-security/up | 4 +++- main/nnd-s6-services/rc/mount.sys/up | 4 +++- main/nnd-s6-services/rc/mount.tmp/up | 4 +++- .../rc/mount.var-lib-ceph-osd-ceph-0/up | 4 +++- main/nnd-s6-services/rc/multipathd/run | 3 --- main/nnd-s6-services/rc/nameif/up | 7 +++--- main/nnd-s6-services/rc/nftables/down | 3 --- main/nnd-s6-services/rc/nftables/up | 9 ++++---- main/nnd-s6-services/rc/ntpd.1/run | 7 +++--- main/nnd-s6-services/rc/partprobe/up | 3 --- .../rc/pipewire-pulse/dependencies.d/pipewire | 0 .../rc/pipewire-pulse/producer-for | 1 + main/nnd-s6-services/rc/pipewire-pulse/run | 4 ++++ main/nnd-s6-services/rc/pipewire-pulse/type | 1 + .../rc/pipewire/dependencies.d/dbus | 0 main/nnd-s6-services/rc/pipewire/producer-for | 1 + main/nnd-s6-services/rc/pipewire/run | 4 ++++ main/nnd-s6-services/rc/pipewire/type | 1 + .../rc/prometheus-node-exporter/run | 8 ++++--- main/nnd-s6-services/rc/qemu-ga/run | 3 --- main/nnd-s6-services/rc/radvd/run | 7 +++--- main/nnd-s6-services/rc/seatd/run | 3 --- main/nnd-s6-services/rc/smartd/run | 8 ++++--- main/nnd-s6-services/rc/sshd.1/run | 7 +++--- main/nnd-s6-services/rc/sshd.keygen/up | 3 --- .../rc/swap.Backplane-swap/down | 3 --- .../nnd-s6-services/rc/swap.Backplane-swap/up | 3 --- .../sys.kernel-mm-ksm-merge_across_nodes/up | 4 +++- .../rc/sys.kernel-mm-ksm-run/up | 4 +++- .../up | 4 +++- .../rc/sysctl.dev-tty-legacy_tiocsti/up | 4 +++- .../rc/sysctl.kernel-hostname/up | 4 +++- .../up | 4 +++- .../up | 4 +++- .../up | 4 +++- .../rc/sysctl.net-ipv4-tcp_l3mdev_accept/up | 4 +++- .../rc/sysctl.net-ipv4-udp_l3mdev_accept/up | 4 +++- .../rc/sysctl.net-ipv6-conf-all-forwarding/up | 4 +++- .../up | 4 +++- .../up | 4 +++- .../up | 4 +++- .../rc/sysctl.vm-nr_hugepages/up | 4 +++- .../rc/sysctl.vm-overcommit_memory/up | 4 +++- .../rc/sysctl.vm-overcommit_ratio/up | 4 +++- .../rc/sysctl.vm-swappiness/up | 4 +++- main/nnd-s6-services/rc/syslogd/run | 3 --- main/nnd-s6-services/rc/udevd.settle/up | 3 --- .../rc/udevd.trigger.devices/up | 3 --- .../rc/udevd.trigger.subsystems/up | 3 --- main/nnd-s6-services/rc/udevd/run | 3 --- main/nnd-s6-services/rc/user.seat/up | 3 --- main/nnd-s6-services/rc/user.sshd/up | 3 --- main/nnd-s6-services/rc/utmpd/run | 3 --- main/nnd-s6-services/rc/vg.Backplane/down | 3 --- main/nnd-s6-services/rc/vg.Backplane/up | 3 --- .../rc/wireplumber/dependencies.d/pipewire | 0 .../rc/wireplumber/producer-for | 1 + main/nnd-s6-services/rc/wireplumber/run | 4 ++++ main/nnd-s6-services/rc/wireplumber/type | 1 + main/nnd-s6-services/tmpl/binfmt-register | 5 +---- main/nnd-s6-services/tmpl/binfmt-unregister | 3 --- main/nnd-s6-services/tmpl/ceph | 7 ++---- main/nnd-s6-services/tmpl/dir | 3 --- main/nnd-s6-services/tmpl/getty | 6 +---- main/nnd-s6-services/tmpl/libvirtd | 10 ++++----- main/nnd-s6-services/tmpl/logger | 7 ++---- main/nnd-s6-services/tmpl/modprobe | 3 --- main/nnd-s6-services/tmpl/mount | 3 --- main/nnd-s6-services/tmpl/partprobe | 2 -- main/nnd-s6-services/tmpl/podman | 3 --- main/nnd-s6-services/tmpl/rmmod | 3 --- main/nnd-s6-services/tmpl/symlink | 3 --- main/nnd-s6-services/tmpl/sysctl | 3 --- main/nnd-s6-services/tmpl/sysfs | 3 --- main/nnd-s6-services/tmpl/umount | 3 --- 158 files changed, 230 insertions(+), 288 deletions(-) delete mode 100644 main/nnd-s6-services/env/path/PATH delete mode 100644 main/nnd-s6-services/env/xdg/HOME delete mode 100644 main/nnd-s6-services/env/xdg/XDG_CACHE_HOME delete mode 100644 main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME delete mode 100644 main/nnd-s6-services/env/xdg/XDG_DATA_HOME delete mode 100644 main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR delete mode 100644 main/nnd-s6-services/env/xdg/XDG_STATE_HOME rename main/nnd-s6-services/rc/{bundle.net/contents.d/interface.lo.link => bundle.interface.lo.configure/contents.d/interface.lo.create} (100%) create mode 100644 main/nnd-s6-services/rc/bundle.interface.lo.configure/type create mode 100644 main/nnd-s6-services/rc/bundle.interface.lo.ready/contents.d/interface.lo.link create mode 100644 main/nnd-s6-services/rc/bundle.interface.lo.ready/type create mode 100644 main/nnd-s6-services/rc/bundle.interface.lo/contents.d/bundle.interface.lo.configure create mode 100644 main/nnd-s6-services/rc/bundle.interface.lo/contents.d/bundle.interface.lo.ready create mode 100644 main/nnd-s6-services/rc/bundle.interface.lo/type create mode 100644 main/nnd-s6-services/rc/bundle.net/contents.d/bundle.interface.lo create mode 100644 main/nnd-s6-services/rc/dmeventd/producer-for create mode 100644 main/nnd-s6-services/rc/interface.lo.create/dependencies.d/bundle.hw-coldplug create mode 100644 main/nnd-s6-services/rc/interface.lo.create/type create mode 100644 main/nnd-s6-services/rc/interface.lo.create/up create mode 100644 main/nnd-s6-services/rc/interface.lo.link/dependencies.d/bundle.interface.lo.configure create mode 100644 main/nnd-s6-services/rc/logger.dmeventd/consumer-for create mode 100644 main/nnd-s6-services/rc/logger.dmeventd/dependencies.d/dir.var-log create mode 100644 main/nnd-s6-services/rc/logger.dmeventd/notification-fd create mode 100755 main/nnd-s6-services/rc/logger.dmeventd/run create mode 100644 main/nnd-s6-services/rc/logger.dmeventd/type create mode 100644 main/nnd-s6-services/rc/logger.pipewire/consumer-for create mode 100644 main/nnd-s6-services/rc/logger.pipewire/dependencies.d/dir.var-log create mode 100644 main/nnd-s6-services/rc/logger.pipewire/notification-fd create mode 100755 main/nnd-s6-services/rc/logger.pipewire/run create mode 100644 main/nnd-s6-services/rc/logger.pipewire/type create mode 100644 main/nnd-s6-services/rc/pipewire-pulse/dependencies.d/pipewire create mode 100644 main/nnd-s6-services/rc/pipewire-pulse/producer-for create mode 100755 main/nnd-s6-services/rc/pipewire-pulse/run create mode 100644 main/nnd-s6-services/rc/pipewire-pulse/type create mode 100644 main/nnd-s6-services/rc/pipewire/dependencies.d/dbus create mode 100644 main/nnd-s6-services/rc/pipewire/producer-for create mode 100755 main/nnd-s6-services/rc/pipewire/run create mode 100644 main/nnd-s6-services/rc/pipewire/type create mode 100644 main/nnd-s6-services/rc/wireplumber/dependencies.d/pipewire create mode 100644 main/nnd-s6-services/rc/wireplumber/producer-for create mode 100755 main/nnd-s6-services/rc/wireplumber/run create mode 100644 main/nnd-s6-services/rc/wireplumber/type diff --git a/main/nnd-s6-linux-init/APKBUILD b/main/nnd-s6-linux-init/APKBUILD index c539b19..dede581 100644 --- a/main/nnd-s6-linux-init/APKBUILD +++ b/main/nnd-s6-linux-init/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=nnd-s6-linux-init -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=0 pkgdesc="Skeleton for nnd-s6-services and symlinks" url="none" @@ -22,6 +22,7 @@ prepare() { build() { s6-linux-init-maker -1 \ + -e PATH='/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin' \ -e HOME=/root \ -e XDG_RUNTIME_DIR=/run \ -e XDG_CONFIG_HOME=/etc \ diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 1cd0a0a..81f200a 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -3,8 +3,8 @@ . ../../APKBUILD.template pkgname=nnd-s6-services -pkgver=2.64 -pkgrel=2 +pkgver=2.66 +pkgrel=0 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" builddir="$srcdir/" @@ -14,7 +14,6 @@ options="" prepare() { default_prepare cp -R "$startdir"/rc "$builddir"/rc - cp -R "$startdir"/env "$builddir"/env cp -R "$startdir"/tmpl "$builddir"/tmpl cp "$startdir"/manage.sh "$builddir"/manage.sh } @@ -22,8 +21,8 @@ prepare() { package() { # Distributed bundles mkdir -p "$pkgdir/$_distpfx" + mkdir -p "$pkgdir/$_distpfx"/env mv "$builddir"/rc "$pkgdir/$_distpfx"/rc - mv "$builddir"/env "$pkgdir/$_distpfx"/env mkdir -p "$pkgdir/usr/libexec/nnd/" mv "$builddir"/tmpl "$pkgdir/usr/libexec/nnd"/s6 diff --git a/main/nnd-s6-services/env/path/PATH b/main/nnd-s6-services/env/path/PATH deleted file mode 100644 index e8bb255..0000000 --- a/main/nnd-s6-services/env/path/PATH +++ /dev/null @@ -1 +0,0 @@ -/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin diff --git a/main/nnd-s6-services/env/xdg/HOME b/main/nnd-s6-services/env/xdg/HOME deleted file mode 100644 index cd3d018..0000000 --- a/main/nnd-s6-services/env/xdg/HOME +++ /dev/null @@ -1 +0,0 @@ -/root diff --git a/main/nnd-s6-services/env/xdg/XDG_CACHE_HOME b/main/nnd-s6-services/env/xdg/XDG_CACHE_HOME deleted file mode 100644 index c575b22..0000000 --- a/main/nnd-s6-services/env/xdg/XDG_CACHE_HOME +++ /dev/null @@ -1 +0,0 @@ -/var/cache diff --git a/main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME b/main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME deleted file mode 100644 index 2a19875..0000000 --- a/main/nnd-s6-services/env/xdg/XDG_CONFIG_HOME +++ /dev/null @@ -1 +0,0 @@ -/etc diff --git a/main/nnd-s6-services/env/xdg/XDG_DATA_HOME b/main/nnd-s6-services/env/xdg/XDG_DATA_HOME deleted file mode 100644 index 8a62a0f..0000000 --- a/main/nnd-s6-services/env/xdg/XDG_DATA_HOME +++ /dev/null @@ -1 +0,0 @@ -/usr/share diff --git a/main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR b/main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR deleted file mode 100644 index b24bf88..0000000 --- a/main/nnd-s6-services/env/xdg/XDG_RUNTIME_DIR +++ /dev/null @@ -1 +0,0 @@ -/run diff --git a/main/nnd-s6-services/env/xdg/XDG_STATE_HOME b/main/nnd-s6-services/env/xdg/XDG_STATE_HOME deleted file mode 100644 index 88b12f7..0000000 --- a/main/nnd-s6-services/env/xdg/XDG_STATE_HOME +++ /dev/null @@ -1 +0,0 @@ -/var/lib diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh index 9aa3841..6a81deb 100755 --- a/main/nnd-s6-services/manage.sh +++ b/main/nnd-s6-services/manage.sh @@ -13,6 +13,8 @@ alt_ab() { : ${S6_PATH:="${XDG_DATA_HOME:="/etc"}/s6"} : ${S6_DIST_PATH:="${XDG_CONFIG_HOME:="/usr/share"}/nnd/s6/dist"} +: ${S6_LIVE_PATH:="${XDG_RUNTIME_DIR:="/run"}/s6-rc"} +: ${S6_SCANDIR_PATH:="${XDG_RUNTIME_DIR:="/run"}/service"} : ${S6_RC_PATH:="$S6_PATH/rc"} : ${S6_ENV_PATH:="$S6_PATH/env"} : ${S6_SV_PATH:="$S6_PATH/sv"} @@ -64,14 +66,15 @@ swap() { } update() { - if ! s6-rc-update "$S6_SV_PATH/current.$(DB_FRESH_ACT)"; then + if ! s6-rc-update -l "$S6_LIVE_PATH" "$S6_SV_PATH/current.$(DB_FRESH_ACT)"; then error "Failed to update live state of the database" return "$?" fi } dist() { - for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do + #for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do + for src in "$S6_DIST_PATH/rc"/*; do local svc="${src#$S6_DIST_PATH/}" if [ ! -e "$S6_PATH/$svc" ]; then default "$svc" || return "$?" @@ -157,6 +160,21 @@ removedangle() { find -L "$dir" -maxdepth 1 -type l -exec rm -v -- {} + } +# TODO +# makeusertree() { +# USR="$1" +# UID="$(id -u "$USR")" +# RUNTIME_DIR="/run/user/$UID" +# : ${PARENT_RCDIR:+"/etc/s6/rc"} +# s6-usertree-maker \ +# -d "$RUNTIME_DIR"/service \ +# -r usertree."$UID"/logger.usertree."$UID" \ +# -l "$USR" \ +# "$USR" \ +# "$RUNTIME_DIR"/uncaught-logs/ \ +# "$PARENT_RCDIR" +# } + cmd="$1" shift if [ -z "$cmd" ]; then diff --git a/main/nnd-s6-services/rc/bird/run b/main/nnd-s6-services/rc/bird/run index d2dd851..75631bc 100755 --- a/main/nnd-s6-services/rc/bird/run +++ b/main/nnd-s6-services/rc/bird/run @@ -1,9 +1,8 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/bird -importas -D /etc/bird/bird.conf CONFIG CONFIG +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/bird +importas -D ${XDG_CONFIG_HOME}/bird/bird.conf CONFIG CONFIG fdmove -c 2 1 diff --git a/main/nnd-s6-services/rc/bundle.net/contents.d/interface.lo.link b/main/nnd-s6-services/rc/bundle.interface.lo.configure/contents.d/interface.lo.create similarity index 100% rename from main/nnd-s6-services/rc/bundle.net/contents.d/interface.lo.link rename to main/nnd-s6-services/rc/bundle.interface.lo.configure/contents.d/interface.lo.create diff --git a/main/nnd-s6-services/rc/bundle.interface.lo.configure/type b/main/nnd-s6-services/rc/bundle.interface.lo.configure/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.interface.lo.configure/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/bundle.interface.lo.ready/contents.d/interface.lo.link b/main/nnd-s6-services/rc/bundle.interface.lo.ready/contents.d/interface.lo.link new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.interface.lo.ready/type b/main/nnd-s6-services/rc/bundle.interface.lo.ready/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.interface.lo.ready/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/bundle.interface.lo/contents.d/bundle.interface.lo.configure b/main/nnd-s6-services/rc/bundle.interface.lo/contents.d/bundle.interface.lo.configure new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.interface.lo/contents.d/bundle.interface.lo.ready b/main/nnd-s6-services/rc/bundle.interface.lo/contents.d/bundle.interface.lo.ready new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/bundle.interface.lo/type b/main/nnd-s6-services/rc/bundle.interface.lo/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.interface.lo/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/bundle.net/contents.d/bundle.interface.lo b/main/nnd-s6-services/rc/bundle.net/contents.d/bundle.interface.lo new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/ceph-exporter/run b/main/nnd-s6-services/rc/ceph-exporter/run index 07cb209..d33d6fb 100755 --- a/main/nnd-s6-services/rc/ceph-exporter/run +++ b/main/nnd-s6-services/rc/ceph-exporter/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 ceph-exporter diff --git a/main/nnd-s6-services/rc/ceph.osd.0.block/up b/main/nnd-s6-services/rc/ceph.osd.0.block/up index 65e4d51..743c430 100644 --- a/main/nnd-s6-services/rc/ceph.osd.0.block/up +++ b/main/nnd-s6-services/rc/ceph.osd.0.block/up @@ -1,11 +1,12 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME +importas -i XDG_STATE_HOME XDG_STATE_HOME define ID 0 -s6-envdir -i /etc/s6/env/ceph.osd.${ID} +s6-envdir -i ${XDG_CONFIG_HOME}/s6/env/ceph.osd.${ID} importas -i DEV DEV -emptyenv -export SRC /var/lib/ceph/osd/ceph-${ID}/block +export SRC ${XDG_STATE_HOME}/ceph/osd/ceph-${ID}/block export DEST $DEV /usr/libexec/nnd/s6/symlink diff --git a/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up index 953d6d7..559d7b5 100644 --- a/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up +++ b/main/nnd-s6-services/rc/ceph.osd.0.bluestore-primer/up @@ -1,10 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME define ID 0 -s6-envdir -i /etc/s6/env/ceph.osd.${ID} +s6-envdir -i ${XDG_CONFIG_HOME}/s6/env/ceph.osd.${ID} importas -i DEV DEV -s6-envdir -i /etc/s6/env/path -emptyenv -p - ceph-bluestore-tool prime-osd-dir --dev $DEV --path /var/lib/ceph/osd/ceph-${ID} --no-mon-config diff --git a/main/nnd-s6-services/rc/clock.hw/up b/main/nnd-s6-services/rc/clock.hw/up index 453c7cf..ca3a650 100644 --- a/main/nnd-s6-services/rc/clock.hw/up +++ b/main/nnd-s6-services/rc/clock.hw/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - hwclock -u --systz diff --git a/main/nnd-s6-services/rc/dbus/run b/main/nnd-s6-services/rc/dbus/run index b93bf2b..0cbbefa 100755 --- a/main/nnd-s6-services/rc/dbus/run +++ b/main/nnd-s6-services/rc/dbus/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 dbus-daemon --system --nopidfile --nosyslog --nofork diff --git a/main/nnd-s6-services/rc/dmeventd/producer-for b/main/nnd-s6-services/rc/dmeventd/producer-for new file mode 100644 index 0000000..b6a9047 --- /dev/null +++ b/main/nnd-s6-services/rc/dmeventd/producer-for @@ -0,0 +1 @@ +logger.dmeventd diff --git a/main/nnd-s6-services/rc/dmeventd/run b/main/nnd-s6-services/rc/dmeventd/run index f62afd2..0ee5309 100755 --- a/main/nnd-s6-services/rc/dmeventd/run +++ b/main/nnd-s6-services/rc/dmeventd/run @@ -1,5 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p +fdmove -c 2 1 -dmeventd -d -f +dmeventd -ddd -l diff --git a/main/nnd-s6-services/rc/gortr/run b/main/nnd-s6-services/rc/gortr/run index 209c9ba..f5d7eaf 100755 --- a/main/nnd-s6-services/rc/gortr/run +++ b/main/nnd-s6-services/rc/gortr/run @@ -1,9 +1,8 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/gortr -importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/gortr +importas -D https://dn42.burble.com/roa/dn42_roa_46.json ENDPOINT ENDPOINT fdmove -c 2 1 diff --git a/main/nnd-s6-services/rc/group.seat/up b/main/nnd-s6-services/rc/group.seat/up index a17332c..94afa40 100644 --- a/main/nnd-s6-services/rc/group.seat/up +++ b/main/nnd-s6-services/rc/group.seat/up @@ -1,9 +1,6 @@ #!/bin/execlineb -P define GROUP seat -s6-envdir -i /etc/s6/env/path -emptyenv -p - ifelse -n { # Silence output redirfd -w 1 /dev/null diff --git a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_mld_version/up b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_mld_version/up index 75e483f..3024f53 100644 --- a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_mld_version/up +++ b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_mld_version/up @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 define PROP mcast_mld_version define STATE 2 diff --git a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/down b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/down index b818a6e..0d357b2 100644 --- a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/down +++ b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/down @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 define PROP mcast_querier define STATE 0 diff --git a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/up b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/up index 47f366f..62faa58 100644 --- a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/up +++ b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_querier/up @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 define PROP mcast_querier define STATE 1 diff --git a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/down b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/down index 00dd1e4..3f0234d 100644 --- a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/down +++ b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/down @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 define PROP mcast_router define STATE 0 diff --git a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/up b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/up index e8994d3..10a1cb1 100644 --- a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/up +++ b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_router/up @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 define PROP mcast_router define STATE 1 diff --git a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_snooping/up b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_snooping/up index cb1e085..4b21279 100644 --- a/main/nnd-s6-services/rc/interface.br0.bridge.mcast_snooping/up +++ b/main/nnd-s6-services/rc/interface.br0.bridge.mcast_snooping/up @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 define PROP mcast_snooping define STATE 0 diff --git a/main/nnd-s6-services/rc/interface.br0.create/down b/main/nnd-s6-services/rc/interface.br0.create/down index 6781066..c2b9a2d 100644 --- a/main/nnd-s6-services/rc/interface.br0.create/down +++ b/main/nnd-s6-services/rc/interface.br0.create/down @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 ip link del $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.br0.create/up b/main/nnd-s6-services/rc/interface.br0.create/up index 4a4d79b..a714f96 100644 --- a/main/nnd-s6-services/rc/interface.br0.create/up +++ b/main/nnd-s6-services/rc/interface.br0.create/up @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 ip link add $INTERFACE type bridge diff --git a/main/nnd-s6-services/rc/interface.br0.dhcp/run b/main/nnd-s6-services/rc/interface.br0.dhcp/run index 4cd768b..08e9835 100755 --- a/main/nnd-s6-services/rc/interface.br0.dhcp/run +++ b/main/nnd-s6-services/rc/interface.br0.dhcp/run @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 fdmove -c 2 1 udhcpc -i $INTERFACE -f -S diff --git a/main/nnd-s6-services/rc/interface.br0.link/down b/main/nnd-s6-services/rc/interface.br0.link/down index 8d205e5..708ab8e 100644 --- a/main/nnd-s6-services/rc/interface.br0.link/down +++ b/main/nnd-s6-services/rc/interface.br0.link/down @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 ip link set dev $INTERFACE down diff --git a/main/nnd-s6-services/rc/interface.br0.link/up b/main/nnd-s6-services/rc/interface.br0.link/up index 20bb828..2dced96 100644 --- a/main/nnd-s6-services/rc/interface.br0.link/up +++ b/main/nnd-s6-services/rc/interface.br0.link/up @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE br0 ip link set dev $INTERFACE up diff --git a/main/nnd-s6-services/rc/interface.br0.slave.eth0/down b/main/nnd-s6-services/rc/interface.br0.slave.eth0/down index 8b76e12..110b6e0 100644 --- a/main/nnd-s6-services/rc/interface.br0.slave.eth0/down +++ b/main/nnd-s6-services/rc/interface.br0.slave.eth0/down @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define SLAVEIF eth0 ip link set dev $SLAVEIF nomaster diff --git a/main/nnd-s6-services/rc/interface.br0.slave.eth0/up b/main/nnd-s6-services/rc/interface.br0.slave.eth0/up index 949955a..c778cdf 100644 --- a/main/nnd-s6-services/rc/interface.br0.slave.eth0/up +++ b/main/nnd-s6-services/rc/interface.br0.slave.eth0/up @@ -1,6 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define MASTERIF br0 define SLAVEIF eth0 ip link set dev $SLAVEIF master $MASTERIF diff --git a/main/nnd-s6-services/rc/interface.eth0.create/up b/main/nnd-s6-services/rc/interface.eth0.create/up index ac71d84..c81bba3 100644 --- a/main/nnd-s6-services/rc/interface.eth0.create/up +++ b/main/nnd-s6-services/rc/interface.eth0.create/up @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE eth0 bcnm-waitif 1 $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.eth0.link/down b/main/nnd-s6-services/rc/interface.eth0.link/down index dc13fbd..a2461e4 100644 --- a/main/nnd-s6-services/rc/interface.eth0.link/down +++ b/main/nnd-s6-services/rc/interface.eth0.link/down @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE eth0 ip link set dev $INTERFACE down diff --git a/main/nnd-s6-services/rc/interface.eth0.link/up b/main/nnd-s6-services/rc/interface.eth0.link/up index c98963e..5bd0634 100644 --- a/main/nnd-s6-services/rc/interface.eth0.link/up +++ b/main/nnd-s6-services/rc/interface.eth0.link/up @@ -1,5 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p define INTERFACE eth0 ip link set dev $INTERFACE up diff --git a/main/nnd-s6-services/rc/interface.lo.create/dependencies.d/bundle.hw-coldplug b/main/nnd-s6-services/rc/interface.lo.create/dependencies.d/bundle.hw-coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/interface.lo.create/type b/main/nnd-s6-services/rc/interface.lo.create/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/interface.lo.create/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/interface.lo.create/up b/main/nnd-s6-services/rc/interface.lo.create/up new file mode 100644 index 0000000..a20abe5 --- /dev/null +++ b/main/nnd-s6-services/rc/interface.lo.create/up @@ -0,0 +1,3 @@ +#!/bin/execlineb -P +define INTERFACE lo +bcnm-waitif 1 $INTERFACE diff --git a/main/nnd-s6-services/rc/interface.lo.link/dependencies.d/bundle.interface.lo.configure b/main/nnd-s6-services/rc/interface.lo.link/dependencies.d/bundle.interface.lo.configure new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/interface.lo.link/down b/main/nnd-s6-services/rc/interface.lo.link/down index e423d1f..b5edb92 100644 --- a/main/nnd-s6-services/rc/interface.lo.link/down +++ b/main/nnd-s6-services/rc/interface.lo.link/down @@ -1,7 +1,3 @@ #!/bin/execlineb -P define INTERFACE lo - -s6-envdir -i /etc/s6/env/path -emptyenv -p - ip link set dev $INTERFACE down diff --git a/main/nnd-s6-services/rc/interface.lo.link/up b/main/nnd-s6-services/rc/interface.lo.link/up index ab7c59c..033e015 100644 --- a/main/nnd-s6-services/rc/interface.lo.link/up +++ b/main/nnd-s6-services/rc/interface.lo.link/up @@ -1,7 +1,3 @@ #!/bin/execlineb -P define INTERFACE lo - -s6-envdir -i /etc/s6/env/path -emptyenv -p - ip link set dev $INTERFACE up diff --git a/main/nnd-s6-services/rc/irqbalance/run b/main/nnd-s6-services/rc/irqbalance/run index 0ef816b..09c8d77 100755 --- a/main/nnd-s6-services/rc/irqbalance/run +++ b/main/nnd-s6-services/rc/irqbalance/run @@ -1,9 +1,8 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/irqbalance -importas -D 10 INTERVAL INTERVAL +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/irqbalance +importas -D 10 INTERVAL INTERVAL fdmove -c 2 1 diff --git a/main/nnd-s6-services/rc/klogd/run b/main/nnd-s6-services/rc/klogd/run index 0cc5391..5a1735e 100755 --- a/main/nnd-s6-services/rc/klogd/run +++ b/main/nnd-s6-services/rc/klogd/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P define READFROM /proc/kmsg -s6-envdir -i /etc/s6/env/path -emptyenv -p - redirfd -r 0 $READFROM ucspilogd diff --git a/main/nnd-s6-services/rc/kmod.sysfs/up b/main/nnd-s6-services/rc/kmod.sysfs/up index 265acfe..ef6c7fd 100644 --- a/main/nnd-s6-services/rc/kmod.sysfs/up +++ b/main/nnd-s6-services/rc/kmod.sysfs/up @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - if -t { pipeline { pipeline { diff --git a/main/nnd-s6-services/rc/libvirt.stopall/down b/main/nnd-s6-services/rc/libvirt.stopall/down index 5df8c24..9f4ac0a 100644 --- a/main/nnd-s6-services/rc/libvirt.stopall/down +++ b/main/nnd-s6-services/rc/libvirt.stopall/down @@ -1,6 +1,3 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - pipeline { virsh list --name --all --state-running --state-paused --state-other } forstdin -E -C -p DOMAIN virsh destroy $DOMAIN diff --git a/main/nnd-s6-services/rc/lldpd/run b/main/nnd-s6-services/rc/lldpd/run index 4692c24..d96f921 100755 --- a/main/nnd-s6-services/rc/lldpd/run +++ b/main/nnd-s6-services/rc/lldpd/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 lldpd -d diff --git a/main/nnd-s6-services/rc/logger.dmeventd/consumer-for b/main/nnd-s6-services/rc/logger.dmeventd/consumer-for new file mode 100644 index 0000000..71cca4c --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dmeventd/consumer-for @@ -0,0 +1 @@ +dmeventd diff --git a/main/nnd-s6-services/rc/logger.dmeventd/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.dmeventd/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.dmeventd/notification-fd b/main/nnd-s6-services/rc/logger.dmeventd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dmeventd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.dmeventd/run b/main/nnd-s6-services/rc/logger.dmeventd/run new file mode 100755 index 0000000..77efa99 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dmeventd/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME dmeventd + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.dmeventd/type b/main/nnd-s6-services/rc/logger.dmeventd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.dmeventd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.pipewire/consumer-for b/main/nnd-s6-services/rc/logger.pipewire/consumer-for new file mode 100644 index 0000000..e3f1951 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.pipewire/consumer-for @@ -0,0 +1,3 @@ +pipewire +wireplumber +pipewire-pulse diff --git a/main/nnd-s6-services/rc/logger.pipewire/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.pipewire/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.pipewire/notification-fd b/main/nnd-s6-services/rc/logger.pipewire/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.pipewire/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.pipewire/run b/main/nnd-s6-services/rc/logger.pipewire/run new file mode 100755 index 0000000..7f84dbd --- /dev/null +++ b/main/nnd-s6-services/rc/logger.pipewire/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME pipewire + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.pipewire/type b/main/nnd-s6-services/rc/logger.pipewire/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.pipewire/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/lxd/run b/main/nnd-s6-services/rc/lxd/run index 418f5f1..3d9d0ff 100755 --- a/main/nnd-s6-services/rc/lxd/run +++ b/main/nnd-s6-services/rc/lxd/run @@ -1,8 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - -# Log everything to stdout fdmove -c 2 1 lxd -v diff --git a/main/nnd-s6-services/rc/machineid/up b/main/nnd-s6-services/rc/machineid/up index 4558e72..64603d6 100644 --- a/main/nnd-s6-services/rc/machineid/up +++ b/main/nnd-s6-services/rc/machineid/up @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - ifelse -Xn { [ -r /etc/machine-id ] } { redirfd -w 1 /etc/machine-id foreground { diff --git a/main/nnd-s6-services/rc/mdevd.coldplug/up b/main/nnd-s6-services/rc/mdevd.coldplug/up index 8936472..0af63bb 100644 --- a/main/nnd-s6-services/rc/mdevd.coldplug/up +++ b/main/nnd-s6-services/rc/mdevd.coldplug/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - mdevd-coldplug diff --git a/main/nnd-s6-services/rc/mdevd/run b/main/nnd-s6-services/rc/mdevd/run index ae484fb..bf8828d 100755 --- a/main/nnd-s6-services/rc/mdevd/run +++ b/main/nnd-s6-services/rc/mdevd/run @@ -1,10 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME define NOTIFYFD 3 -s6-envdir -I /etc/s6/env/mdevd +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mdevd importas -D 500000 KBUFSZ KBUFSZ -s6-envdir -i /etc/s6/env/path -emptyenv -p - mdevd -D $NOTIFYFD -b $KBUFSZ diff --git a/main/nnd-s6-services/rc/mount.boot-efi/up b/main/nnd-s6-services/rc/mount.boot-efi/up index abae0b4..3f90420 100644 --- a/main/nnd-s6-services/rc/mount.boot-efi/up +++ b/main/nnd-s6-services/rc/mount.boot-efi/up @@ -1,8 +1,10 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export SRC LABEL=nnd-efi export OPTS rw export FSTYPE vfat -s6-envdir -I /etc/s6/env/mount.boot-efi +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.boot-efi export DEST /boot/efi /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.boot/up b/main/nnd-s6-services/rc/mount.boot/up index b3ec643..f225edb 100644 --- a/main/nnd-s6-services/rc/mount.boot/up +++ b/main/nnd-s6-services/rc/mount.boot/up @@ -1,8 +1,10 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export SRC LABEL=nnd-boot export OPTS rw export FSTYPE ext4 -s6-envdir -I /etc/s6/env/mount.boot +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.boot export DEST /boot /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/up b/main/nnd-s6-services/rc/mount.dev-hugepages/up index 811f3ad..88b5aca 100644 --- a/main/nnd-s6-services/rc/mount.dev-hugepages/up +++ b/main/nnd-s6-services/rc/mount.dev-hugepages/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS pagesize=2M export FSTYPE hugetlbfs -s6-envdir -I /etc/s6/env/mount.dev-hugepages +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-hugepages export DEST /dev/hugepages /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up index 781c40f..6788d35 100644 --- a/main/nnd-s6-services/rc/mount.dev-mqueue/up +++ b/main/nnd-s6-services/rc/mount.dev-mqueue/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,noexec,nodev export FSTYPE mqueue -s6-envdir -I /etc/s6/env/mount.dev-mqueue +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-mqueue export DEST /dev/mqueue /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-pts/up b/main/nnd-s6-services/rc/mount.dev-pts/up index 53ecfc4..cb3cfb8 100644 --- a/main/nnd-s6-services/rc/mount.dev-pts/up +++ b/main/nnd-s6-services/rc/mount.dev-pts/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,noexec,mode=620,ptmxmode=000 export FSTYPE devpts -s6-envdir -I /etc/s6/env/mount.dev-pts +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-pts export DEST /dev/pts /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up index 36a4fd6..bbcca93 100644 --- a/main/nnd-s6-services/rc/mount.dev-shm/up +++ b/main/nnd-s6-services/rc/mount.dev-shm/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,noexec,nodev,inode64 export FSTYPE tmpfs -s6-envdir -I /etc/s6/env/mount.dev-shm +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev-shm export DEST /dev/shm /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev/up b/main/nnd-s6-services/rc/mount.dev/up index c9f1b78..832d1a8 100644 --- a/main/nnd-s6-services/rc/mount.dev/up +++ b/main/nnd-s6-services/rc/mount.dev/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,noexec,mode=755,inode64 export FSTYPE devtmpfs -s6-envdir -I /etc/s6/env/mount.dev +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.dev export DEST /dev /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up index 5814956..9948631 100644 --- a/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up +++ b/main/nnd-s6-services/rc/mount.proc-sys-fs-binfmt_misc/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS rw,nosuid,nodev,noexec,relatime export FSTYPE binfmt_misc -s6-envdir -I /etc/s6/env/mount.proc-sys-fs-binfmt_misc +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.proc-sys-fs-binfmt_misc export DEST /proc/sys/fs/binfmt_misc /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.proc/up b/main/nnd-s6-services/rc/mount.proc/up index fec530a..e4ae98f 100644 --- a/main/nnd-s6-services/rc/mount.proc/up +++ b/main/nnd-s6-services/rc/mount.proc/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,nodev,noexec,hidepid=2 export FSTYPE proc -s6-envdir -I /etc/s6/env/mount.proc +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.proc export DEST /proc /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.root/up b/main/nnd-s6-services/rc/mount.root/up index 67e18a7..3660ff3 100644 --- a/main/nnd-s6-services/rc/mount.root/up +++ b/main/nnd-s6-services/rc/mount.root/up @@ -1,8 +1,10 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export SRC LABEL=nnd-root export OPTS rw export FSTYPE btrfs -s6-envdir -I /etc/s6/env/mount.root +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.root export DEST / /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.run/up b/main/nnd-s6-services/rc/mount.run/up index eef901d..e246129 100644 --- a/main/nnd-s6-services/rc/mount.run/up +++ b/main/nnd-s6-services/rc/mount.run/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nodev,nosuid,mode=755,inode64 export FSTYPE tmpfs -s6-envdir -I /etc/s6/env/mount.run +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.run export DEST /run /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up index c9d40f9..b2c6ba6 100644 --- a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up +++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,nodev,noexec export FSTYPE efivarfs -s6-envdir -I /etc/s6/env/mount.sys-firmware-efi-efivars +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-firmware-efi-efivars export DEST /sys/firmware/efi/efivars /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up index a51f6e7..0ea0a45 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up +++ b/main/nnd-s6-services/rc/mount.sys-fs-cgroup/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS rw,nosuid,nodev,noexec,relatime,nsdelegate export FSTYPE cgroup2 -s6-envdir -I /etc/s6/env/mount.sys-fs-cgroup +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-fs-cgroup export DEST /sys/fs/cgroup /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up index 85dd7f6..85d251f 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up +++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,nodev,noexec export FSTYPE pstore -s6-envdir -I /etc/s6/env/mount.sys-fs-pstore +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-fs-pstore export DEST /sys/fs/pstore /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/up b/main/nnd-s6-services/rc/mount.sys-kernel-security/up index 0f06395..6ce22d4 100644 --- a/main/nnd-s6-services/rc/mount.sys-kernel-security/up +++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,nodev,noexec export FSTYPE securityfs -s6-envdir -I /etc/s6/env/mount.sys-kernel-security +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys-kernel-security export DEST /sys/kernel/security /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys/up b/main/nnd-s6-services/rc/mount.sys/up index 6585667..217b4d6 100644 --- a/main/nnd-s6-services/rc/mount.sys/up +++ b/main/nnd-s6-services/rc/mount.sys/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nosuid,nodev,noexec export FSTYPE sysfs -s6-envdir -I /etc/s6/env/mount.sys +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.sys export DEST /sys /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.tmp/up b/main/nnd-s6-services/rc/mount.tmp/up index 09ed22e..31524e7 100644 --- a/main/nnd-s6-services/rc/mount.tmp/up +++ b/main/nnd-s6-services/rc/mount.tmp/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export OPTS nodev,nosuid export FSTYPE tmpfs -s6-envdir -I /etc/s6/env/mount.tmp +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.tmp export DEST /tmp /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up index e82971f..693f8f6 100644 --- a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up +++ b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export FSTYPE tmpfs -s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0 +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/mount.var-lib-ceph-osd-ceph-0 export DEST /var/lib/ceph/osd/ceph-0 /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/multipathd/run b/main/nnd-s6-services/rc/multipathd/run index 6e605c8..5311533 100755 --- a/main/nnd-s6-services/rc/multipathd/run +++ b/main/nnd-s6-services/rc/multipathd/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 multipathd -d -v 3 diff --git a/main/nnd-s6-services/rc/nameif/up b/main/nnd-s6-services/rc/nameif/up index 4dea15e..e2f864f 100644 --- a/main/nnd-s6-services/rc/nameif/up +++ b/main/nnd-s6-services/rc/nameif/up @@ -1,8 +1,7 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/nameif -importas -D /etc/mactab CONFIG CONFIG +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/nameif +importas -D ${XDG_CONFIG_HOME}/mactab CONFIG CONFIG nameif -c $CONFIG diff --git a/main/nnd-s6-services/rc/nftables/down b/main/nnd-s6-services/rc/nftables/down index 82d2844..3d3f4ab 100644 --- a/main/nnd-s6-services/rc/nftables/down +++ b/main/nnd-s6-services/rc/nftables/down @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - nft flush ruleset diff --git a/main/nnd-s6-services/rc/nftables/up b/main/nnd-s6-services/rc/nftables/up index 999aeb1..8570573 100644 --- a/main/nnd-s6-services/rc/nftables/up +++ b/main/nnd-s6-services/rc/nftables/up @@ -1,9 +1,8 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/nftables -importas -D /etc/nnd/nftables/loadall RULESET RULESET -importas -D /etc/nnd/nftables/ RULEDIR RULEDIR +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/nftables +importas -D ${XDG_CONFIG_HOME}/nnd/nftables/loadall RULESET RULESET +importas -D ${XDG_CONFIG_HOME}/nnd/nftables/ RULEDIR RULEDIR nft -I $RULEDIR -f $RULESET diff --git a/main/nnd-s6-services/rc/ntpd.1/run b/main/nnd-s6-services/rc/ntpd.1/run index d88e15c..f51b268 100755 --- a/main/nnd-s6-services/rc/ntpd.1/run +++ b/main/nnd-s6-services/rc/ntpd.1/run @@ -1,9 +1,8 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/ntpd.1 -importas -D 2.pool.ntp.org NTPS NTPS +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/ntpd.1 +importas -D 2.pool.ntp.org NTPS NTPS fdmove -c 2 1 diff --git a/main/nnd-s6-services/rc/partprobe/up b/main/nnd-s6-services/rc/partprobe/up index eedf7be..a1bd042 100644 --- a/main/nnd-s6-services/rc/partprobe/up +++ b/main/nnd-s6-services/rc/partprobe/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/path -emptyenv -p - partprobe diff --git a/main/nnd-s6-services/rc/pipewire-pulse/dependencies.d/pipewire b/main/nnd-s6-services/rc/pipewire-pulse/dependencies.d/pipewire new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/pipewire-pulse/producer-for b/main/nnd-s6-services/rc/pipewire-pulse/producer-for new file mode 100644 index 0000000..b4ea362 --- /dev/null +++ b/main/nnd-s6-services/rc/pipewire-pulse/producer-for @@ -0,0 +1 @@ +logger.pipewire diff --git a/main/nnd-s6-services/rc/pipewire-pulse/run b/main/nnd-s6-services/rc/pipewire-pulse/run new file mode 100755 index 0000000..2f4848d --- /dev/null +++ b/main/nnd-s6-services/rc/pipewire-pulse/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +fdmove -c 2 1 + +pipewire-pulse diff --git a/main/nnd-s6-services/rc/pipewire-pulse/type b/main/nnd-s6-services/rc/pipewire-pulse/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/pipewire-pulse/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/pipewire/dependencies.d/dbus b/main/nnd-s6-services/rc/pipewire/dependencies.d/dbus new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/pipewire/producer-for b/main/nnd-s6-services/rc/pipewire/producer-for new file mode 100644 index 0000000..b4ea362 --- /dev/null +++ b/main/nnd-s6-services/rc/pipewire/producer-for @@ -0,0 +1 @@ +logger.pipewire diff --git a/main/nnd-s6-services/rc/pipewire/run b/main/nnd-s6-services/rc/pipewire/run new file mode 100755 index 0000000..aee28b1 --- /dev/null +++ b/main/nnd-s6-services/rc/pipewire/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +fdmove -c 2 1 + +pipewire diff --git a/main/nnd-s6-services/rc/pipewire/type b/main/nnd-s6-services/rc/pipewire/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/pipewire/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/prometheus-node-exporter/run b/main/nnd-s6-services/rc/prometheus-node-exporter/run index fd46104..2ac04a8 100755 --- a/main/nnd-s6-services/rc/prometheus-node-exporter/run +++ b/main/nnd-s6-services/rc/prometheus-node-exporter/run @@ -1,7 +1,9 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/prometheus-node-exporter +importas -D :9100 LISTEN_ADDRESS LISTEN_ADDRESS fdmove -c 2 1 -node_exporter --web.listen-address=:9100 --collector.tcpstat --collector.processes --collector.mountstats +node_exporter --web.listen-address=${LISTEN_ADDRESS} --collector.tcpstat --collector.processes --collector.mountstats diff --git a/main/nnd-s6-services/rc/qemu-ga/run b/main/nnd-s6-services/rc/qemu-ga/run index d6ea062..4163d14 100755 --- a/main/nnd-s6-services/rc/qemu-ga/run +++ b/main/nnd-s6-services/rc/qemu-ga/run @@ -2,7 +2,4 @@ define METHOD virtio-serial define COMMPATH /dev/virtio-ports/org.qemu.guest_agent.0 -s6-envdir -i /etc/s6/env/path -emptyenv -p - qemu-ga --method $METHOD --path $COMMPATH -r diff --git a/main/nnd-s6-services/rc/radvd/run b/main/nnd-s6-services/rc/radvd/run index 64b3928..6fdb981 100755 --- a/main/nnd-s6-services/rc/radvd/run +++ b/main/nnd-s6-services/rc/radvd/run @@ -1,8 +1,7 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/radvd -importas -D /etc/radvd/radvd.conf CONFIG CONFIG +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/radvd +importas -D ${XDG_CONFIG_HOME}/radvd/radvd.conf CONFIG CONFIG radvd -n -m syslog -C $CONFIG diff --git a/main/nnd-s6-services/rc/seatd/run b/main/nnd-s6-services/rc/seatd/run index b0c8667..d4da784 100755 --- a/main/nnd-s6-services/rc/seatd/run +++ b/main/nnd-s6-services/rc/seatd/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 seatd -n 3 -u seat -g seat diff --git a/main/nnd-s6-services/rc/smartd/run b/main/nnd-s6-services/rc/smartd/run index fe8320c..4c01184 100755 --- a/main/nnd-s6-services/rc/smartd/run +++ b/main/nnd-s6-services/rc/smartd/run @@ -1,5 +1,7 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -smartd -n +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/smartd +importas -D 300 INTERVAL INTERVAL + +smartd -n -i ${INTERVAL} diff --git a/main/nnd-s6-services/rc/sshd.1/run b/main/nnd-s6-services/rc/sshd.1/run index 43bcf68..e436c7c 100755 --- a/main/nnd-s6-services/rc/sshd.1/run +++ b/main/nnd-s6-services/rc/sshd.1/run @@ -1,9 +1,8 @@ #!/bin/execlineb -P -s6-envdir -I /etc/s6/env/sshd.1 -importas -D /etc/ssh/sshd_config SSHDCFG SSHDCFG +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME -s6-envdir -i /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sshd.1 +importas -D ${XDG_CONFIG_HOME}/ssh/sshd_config SSHDCFG SSHDCFG fdmove -c 2 1 diff --git a/main/nnd-s6-services/rc/sshd.keygen/up b/main/nnd-s6-services/rc/sshd.keygen/up index f360bcf..358c123 100644 --- a/main/nnd-s6-services/rc/sshd.keygen/up +++ b/main/nnd-s6-services/rc/sshd.keygen/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - ssh-keygen -A diff --git a/main/nnd-s6-services/rc/swap.Backplane-swap/down b/main/nnd-s6-services/rc/swap.Backplane-swap/down index 9c5d7ec..5396e4c 100644 --- a/main/nnd-s6-services/rc/swap.Backplane-swap/down +++ b/main/nnd-s6-services/rc/swap.Backplane-swap/down @@ -1,7 +1,4 @@ #!/bin/execlineb -P define SWAPFILE /dev/Backplane/swap -s6-envdir -i /etc/s6/env/path -emptyenv -p - swapoff $SWAPFILE diff --git a/main/nnd-s6-services/rc/swap.Backplane-swap/up b/main/nnd-s6-services/rc/swap.Backplane-swap/up index 85ec443..86bbd13 100644 --- a/main/nnd-s6-services/rc/swap.Backplane-swap/up +++ b/main/nnd-s6-services/rc/swap.Backplane-swap/up @@ -1,7 +1,4 @@ #!/bin/execlineb -P define SWAPFILE /dev/Backplane/swap -s6-envdir -i /etc/s6/env/path -emptyenv -p - swapon $SWAPFILE diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up index cb1ea3e..fdb8be2 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-merge_across_nodes/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sys.kernel-mm-ksm-merge_across_nodes +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sys.kernel-mm-ksm-merge_across_nodes export SYSPATH kernel/mm/ksm/merge_across_nodes /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up index 429a812..68f0770 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sys.kernel-mm-ksm-run +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sys.kernel-mm-ksm-run export SYSPATH kernel/mm/ksm/run /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up index f10b30e..55dafa8 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up +++ b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL madvise -s6-envdir -I /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sys.kernel-mm-transparent_hugepage-enabled export SYSPATH kernel/mm/transparent_hugepage/enabled /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up index 06bd7fb..1a59de7 100644 --- a/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up +++ b/main/nnd-s6-services/rc/sysctl.dev-tty-legacy_tiocsti/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 0 -s6-envdir -I /etc/s6/env/sysctl.dev-tty-legacy_tiocsti +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.dev-tty-legacy_tiocsti export SYSCTL dev/tty/legacy_tiocsti /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up index e780a5d..be59521 100644 --- a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up +++ b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL nnd-localhost -s6-envdir -I /etc/s6/env/sysctl.kernel-hostname +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.kernel-hostname export SYSCTL kernel/hostname /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-ip6tables/up b/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-ip6tables/up index 5000527..0c20a4b 100644 --- a/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-ip6tables/up +++ b/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-ip6tables/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-bridge-bridge-nf-call-ip6tables +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-bridge-bridge-nf-call-ip6tables export SYSCTL net/bridge/bridge-nf-call-ip6tables /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-iptables/up b/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-iptables/up index b3c125a..3dff66d 100644 --- a/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-iptables/up +++ b/main/nnd-s6-services/rc/sysctl.net-bridge-bridge-nf-call-iptables/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-bridge-bridge-nf-call-iptables +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-bridge-bridge-nf-call-iptables export SYSCTL net/bridge/bridge-nf-call-iptables /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up index 312409b..bc32c66 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-ip_unprivileged_port_start/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 0 -s6-envdir -I /etc/s6/env/sysctl.net-ipv4-ip_unprivileged_port_start +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv4-ip_unprivileged_port_start export SYSCTL net/ipv4/ip_unprivileged_port_start /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up index 1e7be7c..f4dd461 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-tcp_l3mdev_accept/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-ipv4-tcp_l3mdev_accept +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv4-tcp_l3mdev_accept export SYSCTL net/ipv4/tcp_l3mdev_accept /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up index f78ee76..87a6075 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv4-udp_l3mdev_accept/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-ipv4-udp_l3mdev_accept +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv4-udp_l3mdev_accept export SYSCTL net/ipv4/udp_l3mdev_accept /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up index 8f7f52b..b71487e 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-forwarding/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + define INTERFACE all export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-${INTERFACE}-forwarding +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv6-conf-${INTERFACE}-forwarding export SYSCTL net/ipv6/conf/${INTERFACE}/forwarding /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up index 19a5507..1748f17 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-all-keep_addr_on_down/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-all-keep_addr_on_down +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv6-conf-all-keep_addr_on_down export SYSCTL net/ipv6/conf/all/keep_addr_on_down /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up index 196ad33..0b421b9 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-forwarding/up @@ -1,7 +1,9 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + define INTERFACE default export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-${INTERFACE}-forwarding +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv6-conf-${INTERFACE}-forwarding export SYSCTL net/ipv6/conf/${INTERFACE}/forwarding /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up index e82a055..b52b82b 100644 --- a/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up +++ b/main/nnd-s6-services/rc/sysctl.net-ipv6-conf-default-keep_addr_on_down/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1 -s6-envdir -I /etc/s6/env/sysctl.net-ipv6-conf-default-keep_addr_on_down +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.net-ipv6-conf-default-keep_addr_on_down export SYSCTL net/ipv6/conf/default/keep_addr_on_down /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up index 7094fb6..9cd84fe 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up +++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 1000 -s6-envdir -I /etc/s6/env/sysctl.vm-nr_hugepages +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.vm-nr_hugepages export SYSCTL vm/nr_hugepages /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up index 77e2f2d..8e71c95 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_memory/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 2 -s6-envdir -I /etc/s6/env/sysctl.vm-overcommit_memory +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.vm-overcommit_memory export SYSCTL vm/overcommit_memory /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up index aaf9b4e..5b818c5 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up +++ b/main/nnd-s6-services/rc/sysctl.vm-overcommit_ratio/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 95 -s6-envdir -I /etc/s6/env/sysctl.vm-overcommit_ratio +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.vm-overcommit_ratio export SYSCTL vm/overcommit_ratio /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-swappiness/up b/main/nnd-s6-services/rc/sysctl.vm-swappiness/up index 5db1251..f6a5410 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-swappiness/up +++ b/main/nnd-s6-services/rc/sysctl.vm-swappiness/up @@ -1,6 +1,8 @@ #!/bin/execlineb -P +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME + export VAL 10 -s6-envdir -I /etc/s6/env/sysctl.vm-swappiness +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/sysctl.vm-swappiness export SYSCTL vm/swappiness /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/syslogd/run b/main/nnd-s6-services/rc/syslogd/run index f8c7dca..b5be8aa 100755 --- a/main/nnd-s6-services/rc/syslogd/run +++ b/main/nnd-s6-services/rc/syslogd/run @@ -2,8 +2,5 @@ # TODO: Change/allow this to be changed when you find out why this even exists define RUNAS nobody -s6-envdir -i /etc/s6/env/path -emptyenv -p - s6-envuidgid $RUNAS s6-socklog -d3 -U -t3000 diff --git a/main/nnd-s6-services/rc/udevd.settle/up b/main/nnd-s6-services/rc/udevd.settle/up index e8cf82c..9bfaacd 100644 --- a/main/nnd-s6-services/rc/udevd.settle/up +++ b/main/nnd-s6-services/rc/udevd.settle/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - udevadm settle diff --git a/main/nnd-s6-services/rc/udevd.trigger.devices/up b/main/nnd-s6-services/rc/udevd.trigger.devices/up index 3934598..b53cd5a 100644 --- a/main/nnd-s6-services/rc/udevd.trigger.devices/up +++ b/main/nnd-s6-services/rc/udevd.trigger.devices/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - udevadm trigger --type=devices --action=add diff --git a/main/nnd-s6-services/rc/udevd.trigger.subsystems/up b/main/nnd-s6-services/rc/udevd.trigger.subsystems/up index 7678e18..4fe4fc2 100644 --- a/main/nnd-s6-services/rc/udevd.trigger.subsystems/up +++ b/main/nnd-s6-services/rc/udevd.trigger.subsystems/up @@ -1,5 +1,2 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - udevadm trigger --type=subsystems --action=add diff --git a/main/nnd-s6-services/rc/udevd/run b/main/nnd-s6-services/rc/udevd/run index 51ca714..17a0b47 100755 --- a/main/nnd-s6-services/rc/udevd/run +++ b/main/nnd-s6-services/rc/udevd/run @@ -1,7 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 udevd -D diff --git a/main/nnd-s6-services/rc/user.seat/up b/main/nnd-s6-services/rc/user.seat/up index ae4bcfa..0ff1973 100644 --- a/main/nnd-s6-services/rc/user.seat/up +++ b/main/nnd-s6-services/rc/user.seat/up @@ -2,9 +2,6 @@ define SHELL /sbin/nologin define USER seat -s6-envdir -i /etc/s6/env/path -emptyenv -p - ifelse -n { # Silence output redirfd -w 1 /dev/null diff --git a/main/nnd-s6-services/rc/user.sshd/up b/main/nnd-s6-services/rc/user.sshd/up index 4ae6930..a26bbe4 100644 --- a/main/nnd-s6-services/rc/user.sshd/up +++ b/main/nnd-s6-services/rc/user.sshd/up @@ -2,9 +2,6 @@ define SHELL /sbin/nologin define USER sshd -s6-envdir -i /etc/s6/env/path -emptyenv -p - ifelse -n { # Silence output fdmove -c 2 1 diff --git a/main/nnd-s6-services/rc/utmpd/run b/main/nnd-s6-services/rc/utmpd/run index af9c529..9ade5be 100755 --- a/main/nnd-s6-services/rc/utmpd/run +++ b/main/nnd-s6-services/rc/utmpd/run @@ -1,9 +1,6 @@ #!/bin/execlineb -P define SOCKET /run/utmps/.utmpd-socket -s6-envdir -i /etc/s6/env/path -emptyenv -p - # TODO: This is ugly and needs fixes foreground { touch /var/log/wtmp } foreground { chmod 644 /var/log/wtmp } diff --git a/main/nnd-s6-services/rc/vg.Backplane/down b/main/nnd-s6-services/rc/vg.Backplane/down index afb2190..22fcaae 100644 --- a/main/nnd-s6-services/rc/vg.Backplane/down +++ b/main/nnd-s6-services/rc/vg.Backplane/down @@ -1,7 +1,4 @@ #!/bin/execlineb -P define VG Backplane -s6-envdir -i /etc/s6/env/path -emptyenv -p - vgchange -a n $VG diff --git a/main/nnd-s6-services/rc/vg.Backplane/up b/main/nnd-s6-services/rc/vg.Backplane/up index 570eeb2..b5d22b7 100644 --- a/main/nnd-s6-services/rc/vg.Backplane/up +++ b/main/nnd-s6-services/rc/vg.Backplane/up @@ -1,7 +1,4 @@ #!/bin/execlineb -P define VG Backplane -s6-envdir -i /etc/s6/env/path -emptyenv -p - vgchange -a y $VG diff --git a/main/nnd-s6-services/rc/wireplumber/dependencies.d/pipewire b/main/nnd-s6-services/rc/wireplumber/dependencies.d/pipewire new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/wireplumber/producer-for b/main/nnd-s6-services/rc/wireplumber/producer-for new file mode 100644 index 0000000..b4ea362 --- /dev/null +++ b/main/nnd-s6-services/rc/wireplumber/producer-for @@ -0,0 +1 @@ +logger.pipewire diff --git a/main/nnd-s6-services/rc/wireplumber/run b/main/nnd-s6-services/rc/wireplumber/run new file mode 100755 index 0000000..da940aa --- /dev/null +++ b/main/nnd-s6-services/rc/wireplumber/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +fdmove -c 2 1 + +wireplumber diff --git a/main/nnd-s6-services/rc/wireplumber/type b/main/nnd-s6-services/rc/wireplumber/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/wireplumber/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/tmpl/binfmt-register b/main/nnd-s6-services/tmpl/binfmt-register index ac4eb35..ed1bc15 100755 --- a/main/nnd-s6-services/tmpl/binfmt-register +++ b/main/nnd-s6-services/tmpl/binfmt-register @@ -1,9 +1,6 @@ #!/bin/execlineb -W importas -i ENTRY ENTRY -importas -D /etc/binfmt.d/${ENTRY}.conf CONFIG CONFIG - -s6-envdir -I /etc/s6/env/path -emptyenv -p +importas -D ${XDG_CONFIG_HOME}/binfmt.d/${ENTRY}.conf CONFIG CONFIG redirfd -w 1 /proc/sys/fs/binfmt_misc/register cat $CONFIG diff --git a/main/nnd-s6-services/tmpl/binfmt-unregister b/main/nnd-s6-services/tmpl/binfmt-unregister index 56e8654..9a7084f 100755 --- a/main/nnd-s6-services/tmpl/binfmt-unregister +++ b/main/nnd-s6-services/tmpl/binfmt-unregister @@ -1,8 +1,5 @@ #!/bin/execlineb -W importas -i ENTRY ENTRY -s6-envdir -I /etc/s6/env/path -emptyenv -p - redirfd -w 1 /proc/sys/fs/binfmt_misc/$ENTRY echo -1 diff --git a/main/nnd-s6-services/tmpl/ceph b/main/nnd-s6-services/tmpl/ceph index b892945..ace0ec3 100755 --- a/main/nnd-s6-services/tmpl/ceph +++ b/main/nnd-s6-services/tmpl/ceph @@ -2,11 +2,8 @@ importas -i DAEMON DAEMON importas -i ID ID -s6-envdir -I /etc/s6/env/ceph -importas -D "/etc/ceph/ceph.conf" CONFIG CONFIG - -s6-envdir -I /etc/s6/env/path -emptyenv -p +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/ceph +importas -D "$XDG_CONFIG_HOME/ceph/ceph.conf" CONFIG CONFIG # Log everything to stdout fdmove -c 2 1 diff --git a/main/nnd-s6-services/tmpl/dir b/main/nnd-s6-services/tmpl/dir index cdaf7d2..7e69ea6 100755 --- a/main/nnd-s6-services/tmpl/dir +++ b/main/nnd-s6-services/tmpl/dir @@ -1,7 +1,4 @@ #!/bin/execlineb -W importas -i DIR DIR -s6-envdir -I /etc/s6/env/path -emptyenv -p - mkdir -p $DIR diff --git a/main/nnd-s6-services/tmpl/getty b/main/nnd-s6-services/tmpl/getty index 597d987..be40e80 100755 --- a/main/nnd-s6-services/tmpl/getty +++ b/main/nnd-s6-services/tmpl/getty @@ -1,11 +1,7 @@ #!/bin/execlineb -W importas -i TTY TTY -s6-envdir -I /etc/s6/env/getty.${TTY} +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/getty.${TTY} importas -D 0 BAUD BAUD -s6-envdir -I /etc/s6/env/path - -emptyenv -p - getty $BAUD $TTY diff --git a/main/nnd-s6-services/tmpl/libvirtd b/main/nnd-s6-services/tmpl/libvirtd index ab17b44..13c8852 100755 --- a/main/nnd-s6-services/tmpl/libvirtd +++ b/main/nnd-s6-services/tmpl/libvirtd @@ -1,13 +1,11 @@ #!/bin/execlineb -W +importas -i XDG_CONFIG_HOME XDG_CONFIG_HOME importas -i NAME NAME -s6-envdir -I /etc/s6/env/libvirt -importas -D "/etc/libvirt/virt${NAME}d.conf" CONFIG DEFAULTCONFIG +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/libvirt +importas -D "${XDG_CONFIG_HOME}/libvirt/virt${NAME}d.conf" CONFIG DEFAULTCONFIG -s6-envdir -I /etc/s6/env/libvirt.${NAME} +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/libvirt.${NAME} importas -D $DEFAULTCONFIG CONFIG CONFIG -s6-envdir -I /etc/s6/env/path -emptyenv -p - virt${NAME}d -f $CONFIG diff --git a/main/nnd-s6-services/tmpl/logger b/main/nnd-s6-services/tmpl/logger index df0d507..cbfa6e2 100755 --- a/main/nnd-s6-services/tmpl/logger +++ b/main/nnd-s6-services/tmpl/logger @@ -1,16 +1,13 @@ #!/bin/execlineb -W importas -i NAME NAME -s6-envdir -I /etc/s6/env/logger +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/logger importas -D "/var/log/" PREFIX PREFIX importas -D 1000000 SIZE DEFAULTSIZE importas -D 20 ARCHIVES DEFAULTARCHIVES -s6-envdir -I /etc/s6/env/logger.${NAME} +s6-envdir -I ${XDG_CONFIG_HOME}/s6/env/logger.${NAME} importas -D $DEFAULTSIZE SIZE SIZE importas -D $DEFAULTARCHIVES ARCHIVES ARCHIVES -s6-envdir -I /etc/s6/env/path -emptyenv -p - s6-log -d3 -- t s${SIZE} n${ARCHIVES} ${PREFIX}/${NAME} diff --git a/main/nnd-s6-services/tmpl/modprobe b/main/nnd-s6-services/tmpl/modprobe index 9d8d7d8..de051e5 100755 --- a/main/nnd-s6-services/tmpl/modprobe +++ b/main/nnd-s6-services/tmpl/modprobe @@ -1,7 +1,4 @@ #!/bin/execlineb -W importas -i MODULE MODULE -s6-envdir -I /etc/s6/env/path -emptyenv -p - modprobe $MODULE diff --git a/main/nnd-s6-services/tmpl/mount b/main/nnd-s6-services/tmpl/mount index ca5d0e7..74784c4 100755 --- a/main/nnd-s6-services/tmpl/mount +++ b/main/nnd-s6-services/tmpl/mount @@ -4,9 +4,6 @@ importas -i DEST DEST importas -i FSTYPE FSTYPE importas -D "defaults" OPTS OPTS -s6-envdir -i /etc/s6/env/path -emptyenv -p - foreground { mkdir -p $DEST } # Resolve LABEL and UUID diff --git a/main/nnd-s6-services/tmpl/partprobe b/main/nnd-s6-services/tmpl/partprobe index 0976bbd..123432b 100755 --- a/main/nnd-s6-services/tmpl/partprobe +++ b/main/nnd-s6-services/tmpl/partprobe @@ -1,6 +1,4 @@ #!/bin/execlineb -W importas -i DISK DISK -s6-envdir -I /etc/s6/env/path - partprobe $DISK diff --git a/main/nnd-s6-services/tmpl/podman b/main/nnd-s6-services/tmpl/podman index 81d51ee..87054d9 100755 --- a/main/nnd-s6-services/tmpl/podman +++ b/main/nnd-s6-services/tmpl/podman @@ -1,9 +1,6 @@ #!/bin/execlineb -W importas -i CONTAINERID CONTAINERID -s6-envdir -I /etc/s6/env/path -emptyenv -p - fdmove -c 2 1 podman start -a --sig-proxy $CONTAINERID diff --git a/main/nnd-s6-services/tmpl/rmmod b/main/nnd-s6-services/tmpl/rmmod index f8d6edc..5d3d2c3 100755 --- a/main/nnd-s6-services/tmpl/rmmod +++ b/main/nnd-s6-services/tmpl/rmmod @@ -1,7 +1,4 @@ #!/bin/execlineb -W importas -i MODULE MODULE -s6-envdir -I /etc/s6/env/path -emptyenv -p - rmmod $MODULE diff --git a/main/nnd-s6-services/tmpl/symlink b/main/nnd-s6-services/tmpl/symlink index eae412c..35a947d 100755 --- a/main/nnd-s6-services/tmpl/symlink +++ b/main/nnd-s6-services/tmpl/symlink @@ -2,7 +2,4 @@ importas -i SRC SRC importas -i DEST DEST -s6-envdir -I /etc/s6/env/path -emptyenv -p - ln -sn $DEST $SRC diff --git a/main/nnd-s6-services/tmpl/sysctl b/main/nnd-s6-services/tmpl/sysctl index 545e11c..eb527ab 100755 --- a/main/nnd-s6-services/tmpl/sysctl +++ b/main/nnd-s6-services/tmpl/sysctl @@ -2,7 +2,4 @@ importas -i SYSCTL SYSCTL importas -i VAL VAL -s6-envdir -I /etc/s6/env/path -emptyenv -p - redirfd -w 1 /proc/sys/${SYSCTL} echo $VAL diff --git a/main/nnd-s6-services/tmpl/sysfs b/main/nnd-s6-services/tmpl/sysfs index 274ba10..d78974b 100755 --- a/main/nnd-s6-services/tmpl/sysfs +++ b/main/nnd-s6-services/tmpl/sysfs @@ -2,7 +2,4 @@ importas -i SYSPATH SYSPATH importas -i VAL VAL -s6-envdir -I /etc/s6/env/path -emptyenv -p - redirfd -w 1 /sys/${SYSPATH} echo $VAL diff --git a/main/nnd-s6-services/tmpl/umount b/main/nnd-s6-services/tmpl/umount index 12b128b..c9f2abb 100755 --- a/main/nnd-s6-services/tmpl/umount +++ b/main/nnd-s6-services/tmpl/umount @@ -1,7 +1,4 @@ #!/bin/execlineb -W importas -i DEST DEST -s6-envdir -I /etc/s6/env/path -emptyenv -p - umount $DEST