From 9d90d0a2b7de468523c21d5427dc2785b370ce04 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Thu, 8 Dec 2022 08:09:51 +0000 Subject: [PATCH] Rework structure and template services --- main/nnd-s6-services/APKBUILD | 9 +- main/nnd-s6-services/env/ceph/CONFIG | 1 - .../env/logger.klogd/LOGARCHIVES | 1 - main/nnd-s6-services/env/logger.klogd/LOGSIZE | 1 - .../env/logger.mdevd/LOGARCHIVES | 1 - main/nnd-s6-services/env/logger.mdevd/LOGSIZE | 1 - .../env/logger.ntpd/LOGARCHIVES | 1 - main/nnd-s6-services/env/logger.ntpd/LOGSIZE | 1 - .../env/logger.qemu-ga/LOGARCHIVES | 1 - .../env/logger.qemu-ga/LOGSIZE | 1 - .../env/logger.sshd/LOGARCHIVES | 1 - main/nnd-s6-services/env/logger.sshd/LOGSIZE | 1 - .../env/logger.syslogd/LOGARCHIVES | 1 - .../env/logger.syslogd/LOGSIZE | 1 - .../env/logger.udhcpc/LOGARCHIVES | 1 - .../nnd-s6-services/env/logger.udhcpc/LOGSIZE | 1 - main/nnd-s6-services/env/logger/LOGPREFIX | 1 - .../env/mount.var-lib-ceph-osd-ceph-0/OPTS | 1 - .../HOSTNAME => sysctl.kernel-hostname/VAL} | 0 .../nnd-s6-services/env/virtinterfaced/CONFIG | 1 - main/nnd-s6-services/env/virtlockd/CONFIG | 1 - main/nnd-s6-services/env/virtlogd/CONFIG | 1 - main/nnd-s6-services/env/virtnetworkd/CONFIG | 1 - main/nnd-s6-services/env/virtnodedevd/CONFIG | 1 - main/nnd-s6-services/env/virtproxyd/CONFIG | 1 - main/nnd-s6-services/env/virtqemud/CONFIG | 1 - main/nnd-s6-services/env/virtstoraged/CONFIG | 1 - main/nnd-s6-services/manage.sh | 134 +++++++++++------- .../contents.d/ceph.mds.0} | 0 .../contents.d/ceph.mgr.0} | 0 .../contents.d/ceph.mon.0} | 0 .../contents.d/ceph.osd.0} | 0 main/nnd-s6-services/rc/bundle.ceph/type | 1 + .../contents.d/sysctl.kernel-hostname} | 0 .../{virtqemud => libvirt.interface} | 0 .../{virtstoraged => libvirt.network} | 0 .../contents.d/libvirt.nodedev} | 0 .../contents.d/libvirt.proxy} | 0 .../contents.d/libvirt.qemu} | 0 .../contents.d/libvirt.storage} | 0 .../rc/ceph.mds.0/producer-for | 1 + main/nnd-s6-services/rc/ceph.mds.0/run | 16 +-- .../rc/ceph.mgr.0/producer-for | 1 + main/nnd-s6-services/rc/ceph.mgr.0/run | 16 +-- .../rc/ceph.mon.0/producer-for | 1 + main/nnd-s6-services/rc/ceph.mon.0/run | 16 +-- main/nnd-s6-services/rc/ceph.osd.0.block/up | 12 +- .../rc/ceph.osd.0/producer-for | 1 + main/nnd-s6-services/rc/ceph.osd.0/run | 16 +-- main/nnd-s6-services/rc/dir.var-empty/down | 13 -- main/nnd-s6-services/rc/dir.var-empty/up | 12 +- main/nnd-s6-services/rc/dir.var-lock/down | 13 -- main/nnd-s6-services/rc/dir.var-lock/up | 12 +- main/nnd-s6-services/rc/dir.var-log/up | 12 +- .../dependencies.d/sysctl.kernel-hostname} | 0 main/nnd-s6-services/rc/getty.tty1/run | 15 +- main/nnd-s6-services/rc/hostname/up | 13 -- .../dependencies.d/sysctl.kernel-hostname} | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../dependencies.d/mdevd.coldplug | 0 .../dependencies.d/module.tun | 0 .../rc/libvirt.interface/producer-for | 1 + main/nnd-s6-services/rc/libvirt.interface/run | 4 + .../type | 0 .../dependencies.d/dir.var-lock | 0 .../dependencies.d/mount.root | 0 .../rc/libvirt.lock/producer-for | 1 + main/nnd-s6-services/rc/libvirt.lock/run | 4 + .../rc/{virtlockd => libvirt.lock}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/mount.root | 0 .../rc/libvirt.log/producer-for | 1 + main/nnd-s6-services/rc/libvirt.log/run | 4 + .../rc/{virtlogd => libvirt.log}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../rc/libvirt.lxc/producer-for | 1 + main/nnd-s6-services/rc/libvirt.lxc/run | 4 + .../rc/{virtlxcd => libvirt.lxc}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../dependencies.d/module.tun} | 0 .../rc/libvirt.network/producer-for | 1 + main/nnd-s6-services/rc/libvirt.network/run | 4 + .../rc/{virtnetworkd => libvirt.network}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../dependencies.d/mdevd.coldplug} | 0 .../rc/libvirt.nodedev/producer-for | 1 + main/nnd-s6-services/rc/libvirt.nodedev/run | 4 + .../rc/{virtnodedevd => libvirt.nodedev}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../rc/libvirt.proxy/producer-for | 1 + main/nnd-s6-services/rc/libvirt.proxy/run | 4 + .../rc/{virtproxyd => libvirt.proxy}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../dependencies.d/module.kvm} | 0 .../dependencies.d/sys.kernel-mm-ksm-run} | 0 .../rc/libvirt.qemu/producer-for | 1 + main/nnd-s6-services/rc/libvirt.qemu/run | 4 + .../rc/{virtqemud => libvirt.qemu}/type | 0 .../dependencies.d/libvirt.lock} | 0 .../dependencies.d/libvirt.log} | 0 .../dependencies.d/mount.root} | 0 .../rc/libvirt.storage/producer-for | 1 + main/nnd-s6-services/rc/libvirt.storage/run | 4 + .../rc/{virtstoraged => libvirt.storage}/type | 0 .../rc/logger.ceph/consumer-for | 4 + .../rc/logger.ceph/dependencies.d/dir.var-log | 0 .../rc/logger.ceph/notification-fd | 1 + main/nnd-s6-services/rc/logger.ceph/run | 4 + main/nnd-s6-services/rc/logger.ceph/type | 1 + main/nnd-s6-services/rc/logger.klogd/run | 18 +-- .../rc/logger.libvirt/consumer-for | 9 ++ .../logger.libvirt/dependencies.d/dir.var-log | 0 .../rc/logger.libvirt/notification-fd | 1 + main/nnd-s6-services/rc/logger.libvirt/run | 4 + main/nnd-s6-services/rc/logger.libvirt/type | 1 + main/nnd-s6-services/rc/logger.mdevd/run | 18 +-- main/nnd-s6-services/rc/logger.ntpd/run | 18 +-- main/nnd-s6-services/rc/logger.qemu-ga/run | 18 +-- main/nnd-s6-services/rc/logger.sshd/run | 18 +-- main/nnd-s6-services/rc/logger.syslogd/run | 18 +-- main/nnd-s6-services/rc/logger.udhcpc/run | 18 +-- main/nnd-s6-services/rc/module.apparmor/down | 12 +- main/nnd-s6-services/rc/module.apparmor/up | 12 +- main/nnd-s6-services/rc/module.bridge/down | 12 +- main/nnd-s6-services/rc/module.bridge/up | 12 +- main/nnd-s6-services/rc/module.dm-mod/down | 12 +- main/nnd-s6-services/rc/module.dm-mod/up | 12 +- main/nnd-s6-services/rc/module.fuse/down | 12 +- main/nnd-s6-services/rc/module.fuse/up | 12 +- main/nnd-s6-services/rc/module.ipv6/down | 12 +- main/nnd-s6-services/rc/module.ipv6/up | 12 +- main/nnd-s6-services/rc/module.kvm/down | 12 +- main/nnd-s6-services/rc/module.kvm/up | 12 +- main/nnd-s6-services/rc/module.tun/down | 12 +- main/nnd-s6-services/rc/module.tun/up | 12 +- main/nnd-s6-services/rc/module.wireguard/down | 12 +- main/nnd-s6-services/rc/module.wireguard/up | 12 +- main/nnd-s6-services/rc/mount.boot-efi/down | 12 +- main/nnd-s6-services/rc/mount.boot-efi/up | 23 +-- main/nnd-s6-services/rc/mount.boot/down | 12 +- main/nnd-s6-services/rc/mount.boot/up | 23 +-- main/nnd-s6-services/rc/mount.dev-cgroup/down | 12 +- main/nnd-s6-services/rc/mount.dev-cgroup/up | 23 +-- .../rc/mount.dev-hugepages/down | 12 +- .../nnd-s6-services/rc/mount.dev-hugepages/up | 23 +-- main/nnd-s6-services/rc/mount.dev-mqueue/down | 12 +- main/nnd-s6-services/rc/mount.dev-mqueue/up | 23 +-- main/nnd-s6-services/rc/mount.dev-pts/down | 12 +- main/nnd-s6-services/rc/mount.dev-pts/up | 28 +--- main/nnd-s6-services/rc/mount.dev-shm/down | 12 +- main/nnd-s6-services/rc/mount.dev-shm/up | 23 +-- main/nnd-s6-services/rc/mount.dev/down | 12 +- main/nnd-s6-services/rc/mount.dev/up | 28 +--- main/nnd-s6-services/rc/mount.proc/down | 12 +- main/nnd-s6-services/rc/mount.proc/up | 28 +--- main/nnd-s6-services/rc/mount.root/down | 13 +- main/nnd-s6-services/rc/mount.root/up | 16 +-- main/nnd-s6-services/rc/mount.run/down | 12 +- main/nnd-s6-services/rc/mount.run/up | 28 +--- .../rc/mount.sys-firmware-efi-efivars/down | 12 +- .../rc/mount.sys-firmware-efi-efivars/up | 23 +-- .../rc/mount.sys-fs-pstore/down | 12 +- .../nnd-s6-services/rc/mount.sys-fs-pstore/up | 23 +-- .../rc/mount.sys-kernel-security/down | 12 +- .../rc/mount.sys-kernel-security/up | 23 +-- main/nnd-s6-services/rc/mount.sys/down | 12 +- main/nnd-s6-services/rc/mount.sys/up | 28 +--- main/nnd-s6-services/rc/mount.tmp/down | 12 +- main/nnd-s6-services/rc/mount.tmp/up | 28 +--- .../dependencies.d/mount.root | 0 .../rc/mount.var-lib-ceph-osd-ceph-0/down | 12 +- .../rc/mount.var-lib-ceph-osd-ceph-0/up | 23 +-- .../rc/sys.kernel-mm-ksm-run/down | 14 +- .../rc/sys.kernel-mm-ksm-run/up | 19 +-- .../down | 12 +- .../up | 19 +-- .../dependencies.d/mount.proc | 0 .../{hostname => sysctl.kernel-hostname}/type | 0 .../rc/sysctl.kernel-hostname/up | 5 + .../dependencies.d/mount.proc | 0 .../rc/sysctl.vm-nr_hugepages/down | 14 +- .../rc/sysctl.vm-nr_hugepages/up | 19 +-- .../dependencies.d/sysctl.kernel-hostname | 0 main/nnd-s6-services/rc/virtinterfaced/run | 17 --- main/nnd-s6-services/rc/virtlockd/run | 17 --- main/nnd-s6-services/rc/virtlogd/run | 17 --- main/nnd-s6-services/rc/virtlxcd/run | 17 --- main/nnd-s6-services/rc/virtnetworkd/run | 17 --- main/nnd-s6-services/rc/virtnodedevd/run | 17 --- main/nnd-s6-services/rc/virtproxyd/run | 17 --- main/nnd-s6-services/rc/virtqemud/run | 17 --- main/nnd-s6-services/rc/virtstoraged/run | 17 --- main/nnd-s6-services/tmpl/ceph | 17 +++ main/nnd-s6-services/tmpl/dir | 10 ++ main/nnd-s6-services/tmpl/getty | 13 ++ main/nnd-s6-services/tmpl/libvirtd | 16 +++ main/nnd-s6-services/tmpl/logger | 19 +++ main/nnd-s6-services/tmpl/modprobe | 10 ++ main/nnd-s6-services/tmpl/mount | 21 +++ main/nnd-s6-services/tmpl/rmmod | 10 ++ main/nnd-s6-services/tmpl/symlink | 11 ++ main/nnd-s6-services/tmpl/sysctl | 11 ++ main/nnd-s6-services/tmpl/sysfs | 11 ++ main/nnd-s6-services/tmpl/umount | 10 ++ 210 files changed, 512 insertions(+), 1248 deletions(-) delete mode 100644 main/nnd-s6-services/env/ceph/CONFIG delete mode 100644 main/nnd-s6-services/env/logger.klogd/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.klogd/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger.mdevd/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.mdevd/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger.ntpd/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.ntpd/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger.qemu-ga/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.qemu-ga/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger.sshd/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.sshd/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger.syslogd/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.syslogd/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger.udhcpc/LOGARCHIVES delete mode 100644 main/nnd-s6-services/env/logger.udhcpc/LOGSIZE delete mode 100644 main/nnd-s6-services/env/logger/LOGPREFIX delete mode 100644 main/nnd-s6-services/env/mount.var-lib-ceph-osd-ceph-0/OPTS rename main/nnd-s6-services/env/{hostname/HOSTNAME => sysctl.kernel-hostname/VAL} (100%) delete mode 100644 main/nnd-s6-services/env/virtinterfaced/CONFIG delete mode 100644 main/nnd-s6-services/env/virtlockd/CONFIG delete mode 100644 main/nnd-s6-services/env/virtlogd/CONFIG delete mode 100644 main/nnd-s6-services/env/virtnetworkd/CONFIG delete mode 100644 main/nnd-s6-services/env/virtnodedevd/CONFIG delete mode 100644 main/nnd-s6-services/env/virtproxyd/CONFIG delete mode 100644 main/nnd-s6-services/env/virtqemud/CONFIG delete mode 100644 main/nnd-s6-services/env/virtstoraged/CONFIG rename main/nnd-s6-services/rc/{bundle.core/contents.d/hostname => bundle.ceph/contents.d/ceph.mds.0} (100%) rename main/nnd-s6-services/rc/{bundle.libvirt/contents.d/virtinterfaced => bundle.ceph/contents.d/ceph.mgr.0} (100%) rename main/nnd-s6-services/rc/{bundle.libvirt/contents.d/virtnetworkd => bundle.ceph/contents.d/ceph.mon.0} (100%) rename main/nnd-s6-services/rc/{bundle.libvirt/contents.d/virtnodedevd => bundle.ceph/contents.d/ceph.osd.0} (100%) create mode 100644 main/nnd-s6-services/rc/bundle.ceph/type rename main/nnd-s6-services/rc/{bundle.libvirt/contents.d/virtproxyd => bundle.core/contents.d/sysctl.kernel-hostname} (100%) rename main/nnd-s6-services/rc/bundle.libvirt/contents.d/{virtqemud => libvirt.interface} (100%) rename main/nnd-s6-services/rc/bundle.libvirt/contents.d/{virtstoraged => libvirt.network} (100%) rename main/nnd-s6-services/rc/{getty.tty1/dependencies.d/hostname => bundle.libvirt/contents.d/libvirt.nodedev} (100%) rename main/nnd-s6-services/rc/{hostname/dependencies.d/mount.proc => bundle.libvirt/contents.d/libvirt.proxy} (100%) rename main/nnd-s6-services/rc/{klogd/dependencies.d/hostname => bundle.libvirt/contents.d/libvirt.qemu} (100%) rename main/nnd-s6-services/rc/{mount.var-lib-ceph-osd-ceph-0/dependencies.d/mount.rw => bundle.libvirt/contents.d/libvirt.storage} (100%) create mode 100644 main/nnd-s6-services/rc/ceph.mds.0/producer-for create mode 100644 main/nnd-s6-services/rc/ceph.mgr.0/producer-for create mode 100644 main/nnd-s6-services/rc/ceph.mon.0/producer-for create mode 100644 main/nnd-s6-services/rc/ceph.osd.0/producer-for delete mode 100644 main/nnd-s6-services/rc/dir.var-empty/down delete mode 100644 main/nnd-s6-services/rc/dir.var-lock/down rename main/nnd-s6-services/rc/{sysctl.vm-nr_hugepages/dependencies.d/mount.sys => getty.tty1/dependencies.d/sysctl.kernel-hostname} (100%) delete mode 100644 main/nnd-s6-services/rc/hostname/up rename main/nnd-s6-services/rc/{syslogd/dependencies.d/hostname => klogd/dependencies.d/sysctl.kernel-hostname} (100%) rename main/nnd-s6-services/rc/{virtinterfaced/dependencies.d/mdevd.coldplug => libvirt.interface/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtinterfaced/dependencies.d/module.tun => libvirt.interface/dependencies.d/libvirt.log} (100%) rename main/nnd-s6-services/rc/{virtnodedevd => libvirt.interface}/dependencies.d/mdevd.coldplug (100%) rename main/nnd-s6-services/rc/{virtnetworkd => libvirt.interface}/dependencies.d/module.tun (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.interface/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.interface/run rename main/nnd-s6-services/rc/{virtinterfaced => libvirt.interface}/type (100%) rename main/nnd-s6-services/rc/{virtlockd => libvirt.lock}/dependencies.d/dir.var-lock (100%) rename main/nnd-s6-services/rc/{virtlockd => libvirt.lock}/dependencies.d/mount.root (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.lock/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.lock/run rename main/nnd-s6-services/rc/{virtlockd => libvirt.lock}/type (100%) rename main/nnd-s6-services/rc/{virtinterfaced/dependencies.d/virtlockd => libvirt.log/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtlogd => libvirt.log}/dependencies.d/mount.root (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.log/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.log/run rename main/nnd-s6-services/rc/{virtlogd => libvirt.log}/type (100%) rename main/nnd-s6-services/rc/{virtinterfaced/dependencies.d/virtlogd => libvirt.lxc/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtlogd/dependencies.d/virtlockd => libvirt.lxc/dependencies.d/libvirt.log} (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.lxc/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.lxc/run rename main/nnd-s6-services/rc/{virtlxcd => libvirt.lxc}/type (100%) rename main/nnd-s6-services/rc/{virtlxcd/dependencies.d/virtlockd => libvirt.network/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtlxcd/dependencies.d/virtlogd => libvirt.network/dependencies.d/libvirt.log} (100%) rename main/nnd-s6-services/rc/{virtnetworkd/dependencies.d/virtlockd => libvirt.network/dependencies.d/module.tun} (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.network/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.network/run rename main/nnd-s6-services/rc/{virtnetworkd => libvirt.network}/type (100%) rename main/nnd-s6-services/rc/{virtnetworkd/dependencies.d/virtlogd => libvirt.nodedev/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtnodedevd/dependencies.d/virtlockd => libvirt.nodedev/dependencies.d/libvirt.log} (100%) rename main/nnd-s6-services/rc/{virtnodedevd/dependencies.d/virtlogd => libvirt.nodedev/dependencies.d/mdevd.coldplug} (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.nodedev/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.nodedev/run rename main/nnd-s6-services/rc/{virtnodedevd => libvirt.nodedev}/type (100%) rename main/nnd-s6-services/rc/{virtproxyd/dependencies.d/virtlockd => libvirt.proxy/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtproxyd/dependencies.d/virtlogd => libvirt.proxy/dependencies.d/libvirt.log} (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.proxy/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.proxy/run rename main/nnd-s6-services/rc/{virtproxyd => libvirt.proxy}/type (100%) rename main/nnd-s6-services/rc/{virtqemud/dependencies.d/module.kvm => libvirt.qemu/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtqemud/dependencies.d/sys.kernel-mm-ksm-run => libvirt.qemu/dependencies.d/libvirt.log} (100%) rename main/nnd-s6-services/rc/{virtqemud/dependencies.d/virtlockd => libvirt.qemu/dependencies.d/module.kvm} (100%) rename main/nnd-s6-services/rc/{virtqemud/dependencies.d/virtlogd => libvirt.qemu/dependencies.d/sys.kernel-mm-ksm-run} (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.qemu/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.qemu/run rename main/nnd-s6-services/rc/{virtqemud => libvirt.qemu}/type (100%) rename main/nnd-s6-services/rc/{virtstoraged/dependencies.d/mount.root => libvirt.storage/dependencies.d/libvirt.lock} (100%) rename main/nnd-s6-services/rc/{virtstoraged/dependencies.d/virtlockd => libvirt.storage/dependencies.d/libvirt.log} (100%) rename main/nnd-s6-services/rc/{virtstoraged/dependencies.d/virtlogd => libvirt.storage/dependencies.d/mount.root} (100%) create mode 100644 main/nnd-s6-services/rc/libvirt.storage/producer-for create mode 100755 main/nnd-s6-services/rc/libvirt.storage/run rename main/nnd-s6-services/rc/{virtstoraged => libvirt.storage}/type (100%) create mode 100644 main/nnd-s6-services/rc/logger.ceph/consumer-for create mode 100644 main/nnd-s6-services/rc/logger.ceph/dependencies.d/dir.var-log create mode 100644 main/nnd-s6-services/rc/logger.ceph/notification-fd create mode 100755 main/nnd-s6-services/rc/logger.ceph/run create mode 100644 main/nnd-s6-services/rc/logger.ceph/type create mode 100644 main/nnd-s6-services/rc/logger.libvirt/consumer-for create mode 100644 main/nnd-s6-services/rc/logger.libvirt/dependencies.d/dir.var-log create mode 100644 main/nnd-s6-services/rc/logger.libvirt/notification-fd create mode 100755 main/nnd-s6-services/rc/logger.libvirt/run create mode 100644 main/nnd-s6-services/rc/logger.libvirt/type create mode 100644 main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/dependencies.d/mount.root create mode 100644 main/nnd-s6-services/rc/sysctl.kernel-hostname/dependencies.d/mount.proc rename main/nnd-s6-services/rc/{hostname => sysctl.kernel-hostname}/type (100%) create mode 100644 main/nnd-s6-services/rc/sysctl.kernel-hostname/up create mode 100644 main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.proc create mode 100644 main/nnd-s6-services/rc/syslogd/dependencies.d/sysctl.kernel-hostname delete mode 100755 main/nnd-s6-services/rc/virtinterfaced/run delete mode 100755 main/nnd-s6-services/rc/virtlockd/run delete mode 100755 main/nnd-s6-services/rc/virtlogd/run delete mode 100755 main/nnd-s6-services/rc/virtlxcd/run delete mode 100755 main/nnd-s6-services/rc/virtnetworkd/run delete mode 100755 main/nnd-s6-services/rc/virtnodedevd/run delete mode 100755 main/nnd-s6-services/rc/virtproxyd/run delete mode 100755 main/nnd-s6-services/rc/virtqemud/run delete mode 100755 main/nnd-s6-services/rc/virtstoraged/run create mode 100755 main/nnd-s6-services/tmpl/ceph create mode 100755 main/nnd-s6-services/tmpl/dir create mode 100755 main/nnd-s6-services/tmpl/getty create mode 100755 main/nnd-s6-services/tmpl/libvirtd create mode 100755 main/nnd-s6-services/tmpl/logger create mode 100755 main/nnd-s6-services/tmpl/modprobe create mode 100755 main/nnd-s6-services/tmpl/mount create mode 100755 main/nnd-s6-services/tmpl/rmmod create mode 100755 main/nnd-s6-services/tmpl/symlink create mode 100755 main/nnd-s6-services/tmpl/sysctl create mode 100755 main/nnd-s6-services/tmpl/sysfs create mode 100755 main/nnd-s6-services/tmpl/umount diff --git a/main/nnd-s6-services/APKBUILD b/main/nnd-s6-services/APKBUILD index 7c25622..f75591c 100644 --- a/main/nnd-s6-services/APKBUILD +++ b/main/nnd-s6-services/APKBUILD @@ -3,17 +3,19 @@ . ../../APKBUILD.template pkgname=nnd-s6-services -pkgver=1.28 -pkgrel=0 +pkgver=2.0 +pkgrel=15 pkgdesc="Base services for s6" depends="s6-rc s6-portable-utils s6-linux-utils" builddir="$srcdir/" _distpfx="etc/s6/dist" +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 } @@ -23,6 +25,9 @@ package() { 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 + # Manager install -Dm755 "$builddir"/manage.sh "$pkgdir"/usr/bin/nnd-s6 diff --git a/main/nnd-s6-services/env/ceph/CONFIG b/main/nnd-s6-services/env/ceph/CONFIG deleted file mode 100644 index db90000..0000000 --- a/main/nnd-s6-services/env/ceph/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/ceph/ceph.conf diff --git a/main/nnd-s6-services/env/logger.klogd/LOGARCHIVES b/main/nnd-s6-services/env/logger.klogd/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.klogd/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.klogd/LOGSIZE b/main/nnd-s6-services/env/logger.klogd/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.klogd/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger.mdevd/LOGARCHIVES b/main/nnd-s6-services/env/logger.mdevd/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.mdevd/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.mdevd/LOGSIZE b/main/nnd-s6-services/env/logger.mdevd/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.mdevd/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger.ntpd/LOGARCHIVES b/main/nnd-s6-services/env/logger.ntpd/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.ntpd/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.ntpd/LOGSIZE b/main/nnd-s6-services/env/logger.ntpd/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.ntpd/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger.qemu-ga/LOGARCHIVES b/main/nnd-s6-services/env/logger.qemu-ga/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.qemu-ga/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.qemu-ga/LOGSIZE b/main/nnd-s6-services/env/logger.qemu-ga/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.qemu-ga/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger.sshd/LOGARCHIVES b/main/nnd-s6-services/env/logger.sshd/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.sshd/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.sshd/LOGSIZE b/main/nnd-s6-services/env/logger.sshd/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.sshd/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger.syslogd/LOGARCHIVES b/main/nnd-s6-services/env/logger.syslogd/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.syslogd/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.syslogd/LOGSIZE b/main/nnd-s6-services/env/logger.syslogd/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.syslogd/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger.udhcpc/LOGARCHIVES b/main/nnd-s6-services/env/logger.udhcpc/LOGARCHIVES deleted file mode 100644 index 209e3ef..0000000 --- a/main/nnd-s6-services/env/logger.udhcpc/LOGARCHIVES +++ /dev/null @@ -1 +0,0 @@ -20 diff --git a/main/nnd-s6-services/env/logger.udhcpc/LOGSIZE b/main/nnd-s6-services/env/logger.udhcpc/LOGSIZE deleted file mode 100644 index 749fce6..0000000 --- a/main/nnd-s6-services/env/logger.udhcpc/LOGSIZE +++ /dev/null @@ -1 +0,0 @@ -1000000 diff --git a/main/nnd-s6-services/env/logger/LOGPREFIX b/main/nnd-s6-services/env/logger/LOGPREFIX deleted file mode 100644 index c780054..0000000 --- a/main/nnd-s6-services/env/logger/LOGPREFIX +++ /dev/null @@ -1 +0,0 @@ -/var/log diff --git a/main/nnd-s6-services/env/mount.var-lib-ceph-osd-ceph-0/OPTS b/main/nnd-s6-services/env/mount.var-lib-ceph-osd-ceph-0/OPTS deleted file mode 100644 index e8ac604..0000000 --- a/main/nnd-s6-services/env/mount.var-lib-ceph-osd-ceph-0/OPTS +++ /dev/null @@ -1 +0,0 @@ -nodev,nosuid diff --git a/main/nnd-s6-services/env/hostname/HOSTNAME b/main/nnd-s6-services/env/sysctl.kernel-hostname/VAL similarity index 100% rename from main/nnd-s6-services/env/hostname/HOSTNAME rename to main/nnd-s6-services/env/sysctl.kernel-hostname/VAL diff --git a/main/nnd-s6-services/env/virtinterfaced/CONFIG b/main/nnd-s6-services/env/virtinterfaced/CONFIG deleted file mode 100644 index 9a1a82d..0000000 --- a/main/nnd-s6-services/env/virtinterfaced/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtinterfaced diff --git a/main/nnd-s6-services/env/virtlockd/CONFIG b/main/nnd-s6-services/env/virtlockd/CONFIG deleted file mode 100644 index d5a9cfe..0000000 --- a/main/nnd-s6-services/env/virtlockd/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtlockd diff --git a/main/nnd-s6-services/env/virtlogd/CONFIG b/main/nnd-s6-services/env/virtlogd/CONFIG deleted file mode 100644 index ee21207..0000000 --- a/main/nnd-s6-services/env/virtlogd/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtlogd diff --git a/main/nnd-s6-services/env/virtnetworkd/CONFIG b/main/nnd-s6-services/env/virtnetworkd/CONFIG deleted file mode 100644 index 10b74b2..0000000 --- a/main/nnd-s6-services/env/virtnetworkd/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtnetworkd diff --git a/main/nnd-s6-services/env/virtnodedevd/CONFIG b/main/nnd-s6-services/env/virtnodedevd/CONFIG deleted file mode 100644 index c83d5f9..0000000 --- a/main/nnd-s6-services/env/virtnodedevd/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtnodedevd diff --git a/main/nnd-s6-services/env/virtproxyd/CONFIG b/main/nnd-s6-services/env/virtproxyd/CONFIG deleted file mode 100644 index 0484b7d..0000000 --- a/main/nnd-s6-services/env/virtproxyd/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtproxyd diff --git a/main/nnd-s6-services/env/virtqemud/CONFIG b/main/nnd-s6-services/env/virtqemud/CONFIG deleted file mode 100644 index 9ba3aeb..0000000 --- a/main/nnd-s6-services/env/virtqemud/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtqemud diff --git a/main/nnd-s6-services/env/virtstoraged/CONFIG b/main/nnd-s6-services/env/virtstoraged/CONFIG deleted file mode 100644 index 50f3539..0000000 --- a/main/nnd-s6-services/env/virtstoraged/CONFIG +++ /dev/null @@ -1 +0,0 @@ -/etc/libvirt/virtstoraged diff --git a/main/nnd-s6-services/manage.sh b/main/nnd-s6-services/manage.sh index 3e218a1..7839c8d 100755 --- a/main/nnd-s6-services/manage.sh +++ b/main/nnd-s6-services/manage.sh @@ -45,13 +45,6 @@ generate() { fi } -update() { - if ! s6-rc-update "$S6_SV_PATH/current.$DB_FRESH_ACT"; then - error "Failed to update live state of the database" - return "$?" - fi -} - swap() { local new="current.$DB_FRESH_NAC" if ! [ -d "$S6_SV_PATH/$new" ]; then @@ -70,61 +63,71 @@ swap() { fi } -dist() { - SDIR="$S6_DIST_PATH/rc" DPATH="$S6_RC_PATH" distdefs || return "$?" - SDIR="$S6_DIST_PATH/env" DPATH="$S6_ENV_PATH" distdefs || return "$?" - # Remove any dangling invalid symlinks - find -L /etc/s6/rc/ -type l -exec rm -v -- {} + +update() { + if ! s6-rc-update "$S6_SV_PATH/current.$DB_FRESH_ACT"; then + error "Failed to update live state of the database" + return "$?" + fi } -distdefs() { - if [ -z "$SDIR" ]; then - error "SDIR not defined" - return 1 - fi - if [ -z "$DPATH" ]; then - error "DPATH not defined" - return 1 - fi - for cdir in "$SDIR"/*; do - local srv="${cdir##*/}" - local dsv="$DPATH/$srv" - if [ ! -e "$dsv" ]; then - if ! ln -sv "$cdir" "$dsv"; then - error "Failed to create reference" - return "$?" - fi +dist() { + for src in "$S6_DIST_PATH/rc"/* "$S6_DIST_PATH/env"/*; do + local svc="${src#$S6_DIST_PATH/}" + if [ ! -e "$S6_PATH/$svc" ]; then + default "$svc" || return "$?" fi done } +cleanup() { + # Remove any dangling invalid symlinks + for i in rc env; do + removedangle /etc/s6/"$i" || return "$?" + done +} + +default() { + for svc in $@; do + local src="$S6_DIST_PATH/$svc" + local target="$S6_PATH/$svc" + + if ! [ -e "$src" ]; then + error "$svc doesn't exist" + return "$?" + fi + + if [ -h "$target" ]; then + error "$svc is already a default instance" + return "$?" + fi + + defaultfunc || return "$?" + done +} + custom() { - local SVC="$1" + for svc in $@; do + local src="$S6_DIST_PATH/$svc" + local target="$S6_PATH/$svc" - local target="$S6_RC_PATH/$SVC" + if ! [ -e "$src" ]; then + error "$svc doesn't exist" + return "$?" + fi - if ! [ -e "$target" ]; then - error "Service $SVC doesn't exist" - return "$?" - fi + if [ -d "$target" ]; then + error "$svc is already a custom instance" + return "$?" + fi - if ! [ -h "$target" ]; then - error "Service $SVC is already a custom instance" - return "$?" - fi - - customfunc "$S6_DIST_PATH/rc/$SVC" "$target" || return "$?" - - local target="$S6_ENV_PATH/$SVC" - if [ -e "$target" ]; then - customfunc "$S6_DIST_PATH/env/$SVC" "$target" || return "$?" - fi + customfunc || return "$?" + done } customfunc() { - local src="$1" - local target="$2" - if ! rm -rf "$target"; then + : ${src:?Missing src in customfunc} + : ${target:?Missing target in customfunc} + if ! rm "$target"; then error "Failed to remove distributed directory $target" return "$?" fi @@ -135,10 +138,35 @@ customfunc() { fi } +defaultfunc() { + : ${src:?Missing src in defaultfunc} + : ${target:?Missing target in defaultfunc} + if ! rm -rf "$target"; then + error "Failed to remove custom directory $target" + return "$?" + fi + + if ! ln -sv "$src" "$target"; then + error "Failed to create reference to $src" + return "$?" + fi +} + +removedangle() { + local dir="$1" + find -L "$dir" -maxdepth 1 -type l -exec rm -v -- {} + +} + cmd="$1" shift cstate -case "$cmd" in - generate|update|swap|dist|custom) eval "$cmd" $@ || return "$?";; - *) error "Invalid command $cmd"; return 1;; -esac +if [ -z "$cmd" ]; then + generate || return "$?" + swap || return "$?" + update || return "$?" +else + case "$cmd" in + generate|swap|update|dist|custom|default) eval "$cmd" $@ || return "$?";; + *) error "Invalid command $cmd"; return 1;; + esac +fi diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/hostname b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mds.0 similarity index 100% rename from main/nnd-s6-services/rc/bundle.core/contents.d/hostname rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mds.0 diff --git a/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtinterfaced b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mgr.0 similarity index 100% rename from main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtinterfaced rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mgr.0 diff --git a/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnetworkd b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mon.0 similarity index 100% rename from main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnetworkd rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.mon.0 diff --git a/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnodedevd b/main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.osd.0 similarity index 100% rename from main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtnodedevd rename to main/nnd-s6-services/rc/bundle.ceph/contents.d/ceph.osd.0 diff --git a/main/nnd-s6-services/rc/bundle.ceph/type b/main/nnd-s6-services/rc/bundle.ceph/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.ceph/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtproxyd b/main/nnd-s6-services/rc/bundle.core/contents.d/sysctl.kernel-hostname similarity index 100% rename from main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtproxyd rename to main/nnd-s6-services/rc/bundle.core/contents.d/sysctl.kernel-hostname diff --git a/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtqemud b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.interface similarity index 100% rename from main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtqemud rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.interface diff --git a/main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtstoraged b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.network similarity index 100% rename from main/nnd-s6-services/rc/bundle.libvirt/contents.d/virtstoraged rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.network diff --git a/main/nnd-s6-services/rc/getty.tty1/dependencies.d/hostname b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.nodedev similarity index 100% rename from main/nnd-s6-services/rc/getty.tty1/dependencies.d/hostname rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.nodedev diff --git a/main/nnd-s6-services/rc/hostname/dependencies.d/mount.proc b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.proxy similarity index 100% rename from main/nnd-s6-services/rc/hostname/dependencies.d/mount.proc rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.proxy diff --git a/main/nnd-s6-services/rc/klogd/dependencies.d/hostname b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.qemu similarity index 100% rename from main/nnd-s6-services/rc/klogd/dependencies.d/hostname rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.qemu diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/dependencies.d/mount.rw b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.storage similarity index 100% rename from main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/dependencies.d/mount.rw rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.storage diff --git a/main/nnd-s6-services/rc/ceph.mds.0/producer-for b/main/nnd-s6-services/rc/ceph.mds.0/producer-for new file mode 100644 index 0000000..a2b4504 --- /dev/null +++ b/main/nnd-s6-services/rc/ceph.mds.0/producer-for @@ -0,0 +1 @@ +logger.ceph diff --git a/main/nnd-s6-services/rc/ceph.mds.0/run b/main/nnd-s6-services/rc/ceph.mds.0/run index e997dd6..9c88e69 100755 --- a/main/nnd-s6-services/rc/ceph.mds.0/run +++ b/main/nnd-s6-services/rc/ceph.mds.0/run @@ -1,15 +1,5 @@ #!/bin/execlineb -P -define ID 0 -define DAEMON mds +export DAEMON mds +export ID 0 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/ceph -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -exec ceph-${DAEMON} -d -i $ID -c $CONFIG +exec /usr/libexec/nnd/s6/ceph diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/producer-for b/main/nnd-s6-services/rc/ceph.mgr.0/producer-for new file mode 100644 index 0000000..a2b4504 --- /dev/null +++ b/main/nnd-s6-services/rc/ceph.mgr.0/producer-for @@ -0,0 +1 @@ +logger.ceph diff --git a/main/nnd-s6-services/rc/ceph.mgr.0/run b/main/nnd-s6-services/rc/ceph.mgr.0/run index cabd1d8..ed4effc 100755 --- a/main/nnd-s6-services/rc/ceph.mgr.0/run +++ b/main/nnd-s6-services/rc/ceph.mgr.0/run @@ -1,15 +1,5 @@ #!/bin/execlineb -P -define ID 0 -define DAEMON mgr +export DAEMON mgr +export ID 0 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/ceph -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -exec ceph-${DAEMON} -d -i $ID -c $CONFIG +exec /usr/libexec/nnd/s6/ceph diff --git a/main/nnd-s6-services/rc/ceph.mon.0/producer-for b/main/nnd-s6-services/rc/ceph.mon.0/producer-for new file mode 100644 index 0000000..a2b4504 --- /dev/null +++ b/main/nnd-s6-services/rc/ceph.mon.0/producer-for @@ -0,0 +1 @@ +logger.ceph diff --git a/main/nnd-s6-services/rc/ceph.mon.0/run b/main/nnd-s6-services/rc/ceph.mon.0/run index cddcf4d..17ca28d 100755 --- a/main/nnd-s6-services/rc/ceph.mon.0/run +++ b/main/nnd-s6-services/rc/ceph.mon.0/run @@ -1,15 +1,5 @@ #!/bin/execlineb -P -define ID 0 -define DAEMON mon +export DAEMON mon +export ID 0 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/ceph -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -exec ceph-${DAEMON} -d -i $ID -c $CONFIG +exec /usr/libexec/nnd/s6/ceph 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 8a28282..29e27ed 100644 --- a/main/nnd-s6-services/rc/ceph.osd.0.block/up +++ b/main/nnd-s6-services/rc/ceph.osd.0.block/up @@ -1,17 +1,11 @@ #!/bin/execlineb -P define ID 0 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - s6-envdir -i /etc/s6/env/ceph.osd.${ID} importas -i DEV DEV - emptyenv -export PATH $PATH +export SRC /var/lib/ceph/osd/ceph-${ID}/block +export DEST $DEV -fdclose 1 -fdclose 2 - -exec ln -snf $DEV /var/lib/ceph/osd/ceph-${ID}/block +exec /usr/libexec/nnd/s6/symlink diff --git a/main/nnd-s6-services/rc/ceph.osd.0/producer-for b/main/nnd-s6-services/rc/ceph.osd.0/producer-for new file mode 100644 index 0000000..a2b4504 --- /dev/null +++ b/main/nnd-s6-services/rc/ceph.osd.0/producer-for @@ -0,0 +1 @@ +logger.ceph diff --git a/main/nnd-s6-services/rc/ceph.osd.0/run b/main/nnd-s6-services/rc/ceph.osd.0/run index 5ca71c6..f8c1358 100755 --- a/main/nnd-s6-services/rc/ceph.osd.0/run +++ b/main/nnd-s6-services/rc/ceph.osd.0/run @@ -1,15 +1,5 @@ #!/bin/execlineb -P -define ID 0 -define DAEMON osd +export DAEMON osd +export ID 0 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/ceph -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -exec ceph-${DAEMON} -d -i $ID -c $CONFIG +exec /usr/libexec/nnd/s6/ceph diff --git a/main/nnd-s6-services/rc/dir.var-empty/down b/main/nnd-s6-services/rc/dir.var-empty/down deleted file mode 100644 index 691a0bd..0000000 --- a/main/nnd-s6-services/rc/dir.var-empty/down +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv - -export PATH $PATH -# WARNING: DO NOT LET DIR BE EMPTY IN ANY CASE -define DIR /var/empty - -fdclose 1 -fdclose 2 - -exec rm -rf $DIR diff --git a/main/nnd-s6-services/rc/dir.var-empty/up b/main/nnd-s6-services/rc/dir.var-empty/up index f4ae464..f7ae63e 100644 --- a/main/nnd-s6-services/rc/dir.var-empty/up +++ b/main/nnd-s6-services/rc/dir.var-empty/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DIR /var/empty -export PATH $PATH -define DIR /var/empty - -fdclose 1 -fdclose 2 - -exec mkdir -p $DIR +exec /usr/libexec/nnd/s6/dir diff --git a/main/nnd-s6-services/rc/dir.var-lock/down b/main/nnd-s6-services/rc/dir.var-lock/down deleted file mode 100644 index e07dae8..0000000 --- a/main/nnd-s6-services/rc/dir.var-lock/down +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv - -export PATH $PATH -# WARNING: DO NOT LET DIR BE EMPTY IN ANY CASE -define DIR /var/lock - -fdclose 1 -fdclose 2 - -exec rm -rf $DIR diff --git a/main/nnd-s6-services/rc/dir.var-lock/up b/main/nnd-s6-services/rc/dir.var-lock/up index f4ae464..22abf91 100644 --- a/main/nnd-s6-services/rc/dir.var-lock/up +++ b/main/nnd-s6-services/rc/dir.var-lock/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DIR /var/lock -export PATH $PATH -define DIR /var/empty - -fdclose 1 -fdclose 2 - -exec mkdir -p $DIR +exec /usr/libexec/nnd/s6/dir diff --git a/main/nnd-s6-services/rc/dir.var-log/up b/main/nnd-s6-services/rc/dir.var-log/up index 4a04f4d..7ec689b 100644 --- a/main/nnd-s6-services/rc/dir.var-log/up +++ b/main/nnd-s6-services/rc/dir.var-log/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DIR /var/log -export PATH $PATH -define DIR /var/log - -fdclose 1 -fdclose 2 - -exec mkdir -p $DIR +exec /usr/libexec/nnd/s6/dir diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.sys b/main/nnd-s6-services/rc/getty.tty1/dependencies.d/sysctl.kernel-hostname similarity index 100% rename from main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.sys rename to main/nnd-s6-services/rc/getty.tty1/dependencies.d/sysctl.kernel-hostname diff --git a/main/nnd-s6-services/rc/getty.tty1/run b/main/nnd-s6-services/rc/getty.tty1/run index 3319fcb..d501433 100755 --- a/main/nnd-s6-services/rc/getty.tty1/run +++ b/main/nnd-s6-services/rc/getty.tty1/run @@ -1,15 +1,4 @@ #!/bin/execlineb -P -define TTY tty1 +export TTY tty1 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -s6-envdir -i /etc/s6/env/getty.${TTY} -importas -i BAUD BAUD -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec getty ${BAUD} ${TTY} +exec /usr/libexec/nnd/s6/getty diff --git a/main/nnd-s6-services/rc/hostname/up b/main/nnd-s6-services/rc/hostname/up deleted file mode 100644 index 277b11e..0000000 --- a/main/nnd-s6-services/rc/hostname/up +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -s6-envdir -i /etc/s6/env/hostname -importas -i HOSTNAME HOSTNAME -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -redirfd -w 1 /proc/sys/kernel/hostname echo $HOSTNAME diff --git a/main/nnd-s6-services/rc/syslogd/dependencies.d/hostname b/main/nnd-s6-services/rc/klogd/dependencies.d/sysctl.kernel-hostname similarity index 100% rename from main/nnd-s6-services/rc/syslogd/dependencies.d/hostname rename to main/nnd-s6-services/rc/klogd/dependencies.d/sysctl.kernel-hostname diff --git a/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/libvirt.interface/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtinterfaced/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/libvirt.interface/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/module.tun b/main/nnd-s6-services/rc/libvirt.interface/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtinterfaced/dependencies.d/module.tun rename to main/nnd-s6-services/rc/libvirt.interface/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/libvirt.interface/dependencies.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/virtnodedevd/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/libvirt.interface/dependencies.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/module.tun b/main/nnd-s6-services/rc/libvirt.interface/dependencies.d/module.tun similarity index 100% rename from main/nnd-s6-services/rc/virtnetworkd/dependencies.d/module.tun rename to main/nnd-s6-services/rc/libvirt.interface/dependencies.d/module.tun diff --git a/main/nnd-s6-services/rc/libvirt.interface/producer-for b/main/nnd-s6-services/rc/libvirt.interface/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.interface/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.interface/run b/main/nnd-s6-services/rc/libvirt.interface/run new file mode 100755 index 0000000..bac8efe --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.interface/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME interface + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtinterfaced/type b/main/nnd-s6-services/rc/libvirt.interface/type similarity index 100% rename from main/nnd-s6-services/rc/virtinterfaced/type rename to main/nnd-s6-services/rc/libvirt.interface/type diff --git a/main/nnd-s6-services/rc/virtlockd/dependencies.d/dir.var-lock b/main/nnd-s6-services/rc/libvirt.lock/dependencies.d/dir.var-lock similarity index 100% rename from main/nnd-s6-services/rc/virtlockd/dependencies.d/dir.var-lock rename to main/nnd-s6-services/rc/libvirt.lock/dependencies.d/dir.var-lock diff --git a/main/nnd-s6-services/rc/virtlockd/dependencies.d/mount.root b/main/nnd-s6-services/rc/libvirt.lock/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/virtlockd/dependencies.d/mount.root rename to main/nnd-s6-services/rc/libvirt.lock/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/libvirt.lock/producer-for b/main/nnd-s6-services/rc/libvirt.lock/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.lock/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.lock/run b/main/nnd-s6-services/rc/libvirt.lock/run new file mode 100755 index 0000000..752a73b --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.lock/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME lock + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtlockd/type b/main/nnd-s6-services/rc/libvirt.lock/type similarity index 100% rename from main/nnd-s6-services/rc/virtlockd/type rename to main/nnd-s6-services/rc/libvirt.lock/type diff --git a/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.log/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.log/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtlogd/dependencies.d/mount.root b/main/nnd-s6-services/rc/libvirt.log/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/virtlogd/dependencies.d/mount.root rename to main/nnd-s6-services/rc/libvirt.log/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/libvirt.log/producer-for b/main/nnd-s6-services/rc/libvirt.log/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.log/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.log/run b/main/nnd-s6-services/rc/libvirt.log/run new file mode 100755 index 0000000..19e7e37 --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.log/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME log + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtlogd/type b/main/nnd-s6-services/rc/libvirt.log/type similarity index 100% rename from main/nnd-s6-services/rc/virtlogd/type rename to main/nnd-s6-services/rc/libvirt.log/type diff --git a/main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.lxc/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtinterfaced/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.lxc/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtlogd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.lxc/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtlogd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.lxc/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/libvirt.lxc/producer-for b/main/nnd-s6-services/rc/libvirt.lxc/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.lxc/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.lxc/run b/main/nnd-s6-services/rc/libvirt.lxc/run new file mode 100755 index 0000000..81794a8 --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.lxc/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME lxc + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtlxcd/type b/main/nnd-s6-services/rc/libvirt.lxc/type similarity index 100% rename from main/nnd-s6-services/rc/virtlxcd/type rename to main/nnd-s6-services/rc/libvirt.lxc/type diff --git a/main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.network/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.network/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.network/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtlxcd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.network/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.network/dependencies.d/module.tun similarity index 100% rename from main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.network/dependencies.d/module.tun diff --git a/main/nnd-s6-services/rc/libvirt.network/producer-for b/main/nnd-s6-services/rc/libvirt.network/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.network/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.network/run b/main/nnd-s6-services/rc/libvirt.network/run new file mode 100755 index 0000000..96a090f --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.network/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME network + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtnetworkd/type b/main/nnd-s6-services/rc/libvirt.network/type similarity index 100% rename from main/nnd-s6-services/rc/virtnetworkd/type rename to main/nnd-s6-services/rc/libvirt.network/type diff --git a/main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtnetworkd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/virtnodedevd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/libvirt.nodedev/producer-for b/main/nnd-s6-services/rc/libvirt.nodedev/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.nodedev/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.nodedev/run b/main/nnd-s6-services/rc/libvirt.nodedev/run new file mode 100755 index 0000000..1b85518 --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.nodedev/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME nodedev + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtnodedevd/type b/main/nnd-s6-services/rc/libvirt.nodedev/type similarity index 100% rename from main/nnd-s6-services/rc/virtnodedevd/type rename to main/nnd-s6-services/rc/libvirt.nodedev/type diff --git a/main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.proxy/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.proxy/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.proxy/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtproxyd/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.proxy/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/libvirt.proxy/producer-for b/main/nnd-s6-services/rc/libvirt.proxy/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.proxy/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.proxy/run b/main/nnd-s6-services/rc/libvirt.proxy/run new file mode 100755 index 0000000..5c04f8d --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.proxy/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME proxy + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtproxyd/type b/main/nnd-s6-services/rc/libvirt.proxy/type similarity index 100% rename from main/nnd-s6-services/rc/virtproxyd/type rename to main/nnd-s6-services/rc/libvirt.proxy/type diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/module.kvm b/main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtqemud/dependencies.d/module.kvm rename to main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/sys.kernel-mm-ksm-run b/main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtqemud/dependencies.d/sys.kernel-mm-ksm-run rename to main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/module.kvm similarity index 100% rename from main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/module.kvm diff --git a/main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/sys.kernel-mm-ksm-run similarity index 100% rename from main/nnd-s6-services/rc/virtqemud/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.qemu/dependencies.d/sys.kernel-mm-ksm-run diff --git a/main/nnd-s6-services/rc/libvirt.qemu/producer-for b/main/nnd-s6-services/rc/libvirt.qemu/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.qemu/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.qemu/run b/main/nnd-s6-services/rc/libvirt.qemu/run new file mode 100755 index 0000000..37a1730 --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.qemu/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME qemu + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtqemud/type b/main/nnd-s6-services/rc/libvirt.qemu/type similarity index 100% rename from main/nnd-s6-services/rc/virtqemud/type rename to main/nnd-s6-services/rc/libvirt.qemu/type diff --git a/main/nnd-s6-services/rc/virtstoraged/dependencies.d/mount.root b/main/nnd-s6-services/rc/libvirt.storage/dependencies.d/libvirt.lock similarity index 100% rename from main/nnd-s6-services/rc/virtstoraged/dependencies.d/mount.root rename to main/nnd-s6-services/rc/libvirt.storage/dependencies.d/libvirt.lock diff --git a/main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlockd b/main/nnd-s6-services/rc/libvirt.storage/dependencies.d/libvirt.log similarity index 100% rename from main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlockd rename to main/nnd-s6-services/rc/libvirt.storage/dependencies.d/libvirt.log diff --git a/main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlogd b/main/nnd-s6-services/rc/libvirt.storage/dependencies.d/mount.root similarity index 100% rename from main/nnd-s6-services/rc/virtstoraged/dependencies.d/virtlogd rename to main/nnd-s6-services/rc/libvirt.storage/dependencies.d/mount.root diff --git a/main/nnd-s6-services/rc/libvirt.storage/producer-for b/main/nnd-s6-services/rc/libvirt.storage/producer-for new file mode 100644 index 0000000..60b490c --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.storage/producer-for @@ -0,0 +1 @@ +logger.libvirt diff --git a/main/nnd-s6-services/rc/libvirt.storage/run b/main/nnd-s6-services/rc/libvirt.storage/run new file mode 100755 index 0000000..f61682f --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.storage/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME storage + +exec /usr/libexec/nnd/s6/libvirtd diff --git a/main/nnd-s6-services/rc/virtstoraged/type b/main/nnd-s6-services/rc/libvirt.storage/type similarity index 100% rename from main/nnd-s6-services/rc/virtstoraged/type rename to main/nnd-s6-services/rc/libvirt.storage/type diff --git a/main/nnd-s6-services/rc/logger.ceph/consumer-for b/main/nnd-s6-services/rc/logger.ceph/consumer-for new file mode 100644 index 0000000..4fbd929 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.ceph/consumer-for @@ -0,0 +1,4 @@ +ceph.osd.0 +ceph.mon.0 +ceph.mds.0 +ceph.mgr.0 diff --git a/main/nnd-s6-services/rc/logger.ceph/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.ceph/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.ceph/notification-fd b/main/nnd-s6-services/rc/logger.ceph/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.ceph/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.ceph/run b/main/nnd-s6-services/rc/logger.ceph/run new file mode 100755 index 0000000..960d6d7 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.ceph/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME ceph + +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.ceph/type b/main/nnd-s6-services/rc/logger.ceph/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.ceph/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.klogd/run b/main/nnd-s6-services/rc/logger.klogd/run index 7ac6577..4a5d308 100755 --- a/main/nnd-s6-services/rc/logger.klogd/run +++ b/main/nnd-s6-services/rc/logger.klogd/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME klogd +export NAME klogd -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.libvirt/consumer-for b/main/nnd-s6-services/rc/logger.libvirt/consumer-for new file mode 100644 index 0000000..645eb25 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.libvirt/consumer-for @@ -0,0 +1,9 @@ +libvirt.interface +libvirt.lock +libvirt.log +libvirt.lxc +libvirt.network +libvirt.nodedev +libvirt.proxy +libvirt.qemu +libvirt.storage diff --git a/main/nnd-s6-services/rc/logger.libvirt/dependencies.d/dir.var-log b/main/nnd-s6-services/rc/logger.libvirt/dependencies.d/dir.var-log new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/logger.libvirt/notification-fd b/main/nnd-s6-services/rc/logger.libvirt/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.libvirt/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.libvirt/run b/main/nnd-s6-services/rc/logger.libvirt/run new file mode 100755 index 0000000..563c3b1 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.libvirt/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME libvirt + +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.libvirt/type b/main/nnd-s6-services/rc/logger.libvirt/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.libvirt/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/logger.mdevd/run b/main/nnd-s6-services/rc/logger.mdevd/run index 9da745f..deb2e68 100755 --- a/main/nnd-s6-services/rc/logger.mdevd/run +++ b/main/nnd-s6-services/rc/logger.mdevd/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME mdevd +export NAME mdevd -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.ntpd/run b/main/nnd-s6-services/rc/logger.ntpd/run index b7f38db..4692266 100755 --- a/main/nnd-s6-services/rc/logger.ntpd/run +++ b/main/nnd-s6-services/rc/logger.ntpd/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME ntpd +export NAME ntpd -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.qemu-ga/run b/main/nnd-s6-services/rc/logger.qemu-ga/run index d52d4c9..2ed7f38 100755 --- a/main/nnd-s6-services/rc/logger.qemu-ga/run +++ b/main/nnd-s6-services/rc/logger.qemu-ga/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME qemu-ga +export NAME qemu-ga -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.sshd/run b/main/nnd-s6-services/rc/logger.sshd/run index ebc500f..142938f 100755 --- a/main/nnd-s6-services/rc/logger.sshd/run +++ b/main/nnd-s6-services/rc/logger.sshd/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME sshd +export NAME sshd -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.syslogd/run b/main/nnd-s6-services/rc/logger.syslogd/run index f1e4270..dfc3e07 100755 --- a/main/nnd-s6-services/rc/logger.syslogd/run +++ b/main/nnd-s6-services/rc/logger.syslogd/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME syslogd +export NAME syslogd -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.udhcpc/run b/main/nnd-s6-services/rc/logger.udhcpc/run index 4abfdd6..28677d9 100755 --- a/main/nnd-s6-services/rc/logger.udhcpc/run +++ b/main/nnd-s6-services/rc/logger.udhcpc/run @@ -1,18 +1,4 @@ #!/bin/execlineb -P -define LOGGERNAME udhcpc +export NAME udhcpc -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/logger -importas -i LOGPREFIX LOGPREFIX - -s6-envdir -I /etc/s6/env/logger.${LOGGERNAME} -importas -i LOGSIZE LOGSIZE -importas -i LOGARCHIVES LOGARCHIVES - -emptyenv - -export PATH $PATH - -exec s6-log -d3 -- t s${LOGSIZE} n${LOGARCHIVES} ${LOGPREFIX}/${LOGGERNAME} +exec /usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/module.apparmor/down b/main/nnd-s6-services/rc/module.apparmor/down index 5253f71..92fc713 100644 --- a/main/nnd-s6-services/rc/module.apparmor/down +++ b/main/nnd-s6-services/rc/module.apparmor/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE apparmor -export PATH $PATH -define MODULE apparmor - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.apparmor/up b/main/nnd-s6-services/rc/module.apparmor/up index ec7243e..f7c7521 100644 --- a/main/nnd-s6-services/rc/module.apparmor/up +++ b/main/nnd-s6-services/rc/module.apparmor/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE apparmor -export PATH $PATH -define MODULE apparmor - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.bridge/down b/main/nnd-s6-services/rc/module.bridge/down index 1c4ce49..3f8d186 100644 --- a/main/nnd-s6-services/rc/module.bridge/down +++ b/main/nnd-s6-services/rc/module.bridge/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE bridge -export PATH $PATH -define MODULE bridge - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.bridge/up b/main/nnd-s6-services/rc/module.bridge/up index 17317f1..cb6ff7d 100644 --- a/main/nnd-s6-services/rc/module.bridge/up +++ b/main/nnd-s6-services/rc/module.bridge/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE bridge -export PATH $PATH -define MODULE bridge - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.dm-mod/down b/main/nnd-s6-services/rc/module.dm-mod/down index 5d16d66..36d0e76 100644 --- a/main/nnd-s6-services/rc/module.dm-mod/down +++ b/main/nnd-s6-services/rc/module.dm-mod/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE dm-mod -export PATH $PATH -define MODULE dm-mod - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.dm-mod/up b/main/nnd-s6-services/rc/module.dm-mod/up index 3362321..f958d9a 100644 --- a/main/nnd-s6-services/rc/module.dm-mod/up +++ b/main/nnd-s6-services/rc/module.dm-mod/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE dm-mod -export PATH $PATH -define MODULE dm-mod - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.fuse/down b/main/nnd-s6-services/rc/module.fuse/down index 70d7c57..27802de 100644 --- a/main/nnd-s6-services/rc/module.fuse/down +++ b/main/nnd-s6-services/rc/module.fuse/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE fuse -export PATH $PATH -define MODULE fuse - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.fuse/up b/main/nnd-s6-services/rc/module.fuse/up index b9054cc..70b82ed 100644 --- a/main/nnd-s6-services/rc/module.fuse/up +++ b/main/nnd-s6-services/rc/module.fuse/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE fuse -export PATH $PATH -define MODULE fuse - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.ipv6/down b/main/nnd-s6-services/rc/module.ipv6/down index 76f26f4..d689db2 100644 --- a/main/nnd-s6-services/rc/module.ipv6/down +++ b/main/nnd-s6-services/rc/module.ipv6/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE ipv6 -export PATH $PATH -define MODULE ipv6 - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.ipv6/up b/main/nnd-s6-services/rc/module.ipv6/up index 80c6106..15c33b4 100644 --- a/main/nnd-s6-services/rc/module.ipv6/up +++ b/main/nnd-s6-services/rc/module.ipv6/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE ipv6 -export PATH $PATH -define MODULE ipv6 - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.kvm/down b/main/nnd-s6-services/rc/module.kvm/down index f114da0..084e092 100644 --- a/main/nnd-s6-services/rc/module.kvm/down +++ b/main/nnd-s6-services/rc/module.kvm/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE kvm -export PATH $PATH -define MODULE kvm - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.kvm/up b/main/nnd-s6-services/rc/module.kvm/up index cae63e9..601bff9 100644 --- a/main/nnd-s6-services/rc/module.kvm/up +++ b/main/nnd-s6-services/rc/module.kvm/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE kvm -export PATH $PATH -define MODULE kvm - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.tun/down b/main/nnd-s6-services/rc/module.tun/down index 1c621c4..c4a1c60 100644 --- a/main/nnd-s6-services/rc/module.tun/down +++ b/main/nnd-s6-services/rc/module.tun/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE tun -export PATH $PATH -define MODULE tun - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.tun/up b/main/nnd-s6-services/rc/module.tun/up index f090514..069527a 100644 --- a/main/nnd-s6-services/rc/module.tun/up +++ b/main/nnd-s6-services/rc/module.tun/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE tun -export PATH $PATH -define MODULE tun - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/module.wireguard/down b/main/nnd-s6-services/rc/module.wireguard/down index c9cec27..92c53cc 100644 --- a/main/nnd-s6-services/rc/module.wireguard/down +++ b/main/nnd-s6-services/rc/module.wireguard/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE wireguard -export PATH $PATH -define MODULE wireguard - -fdclose 1 -fdclose 2 - -exec rmmod $MODULE +exec /usr/libexec/nnd/s6/rmmod diff --git a/main/nnd-s6-services/rc/module.wireguard/up b/main/nnd-s6-services/rc/module.wireguard/up index ee3f814..e7fe245 100644 --- a/main/nnd-s6-services/rc/module.wireguard/up +++ b/main/nnd-s6-services/rc/module.wireguard/up @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export MODULE wireguard -export PATH $PATH -define MODULE wireguard - -fdclose 1 -fdclose 2 - -exec modprobe $MODULE +exec /usr/libexec/nnd/s6/modprobe diff --git a/main/nnd-s6-services/rc/mount.boot-efi/down b/main/nnd-s6-services/rc/mount.boot-efi/down index e1da1c1..092d5f6 100644 --- a/main/nnd-s6-services/rc/mount.boot-efi/down +++ b/main/nnd-s6-services/rc/mount.boot-efi/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /boot/efi -export PATH $PATH -define DEST /boot/efi - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.boot-efi/up b/main/nnd-s6-services/rc/mount.boot-efi/up index d4d1510..1b7fea1 100644 --- a/main/nnd-s6-services/rc/mount.boot-efi/up +++ b/main/nnd-s6-services/rc/mount.boot-efi/up @@ -1,22 +1,5 @@ #!/bin/execlineb -P -define DEST /boot/efi -define CLEANDEST boot-efi +s6-envdir -i /etc/s6/env/mount.boot-efi +export DEST /boot/efi -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i SRC SRC -importas -i FSTYPE FSTYPE -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS $SRC $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.boot/down b/main/nnd-s6-services/rc/mount.boot/down index feecbb5..57ac288 100644 --- a/main/nnd-s6-services/rc/mount.boot/down +++ b/main/nnd-s6-services/rc/mount.boot/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /boot -export PATH $PATH -define DEST /boot - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.boot/up b/main/nnd-s6-services/rc/mount.boot/up index b08332d..33250fc 100644 --- a/main/nnd-s6-services/rc/mount.boot/up +++ b/main/nnd-s6-services/rc/mount.boot/up @@ -1,22 +1,5 @@ #!/bin/execlineb -P -define DEST /boot -define CLEANDEST boot +s6-envdir -i /etc/s6/env/mount.boot +export DEST /boot -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i SRC SRC -importas -i FSTYPE FSTYPE -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS $SRC $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/down b/main/nnd-s6-services/rc/mount.dev-cgroup/down index cf69586..2a1725e 100644 --- a/main/nnd-s6-services/rc/mount.dev-cgroup/down +++ b/main/nnd-s6-services/rc/mount.dev-cgroup/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /dev/cgroup -export PATH $PATH -define DEST /dev/cgroup - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.dev-cgroup/up b/main/nnd-s6-services/rc/mount.dev-cgroup/up index 0adbaf9..cfcaa31 100644 --- a/main/nnd-s6-services/rc/mount.dev-cgroup/up +++ b/main/nnd-s6-services/rc/mount.dev-cgroup/up @@ -1,21 +1,6 @@ #!/bin/execlineb -P -define DEST /dev/cgroup -define CLEANDEST dev-cgroup -define FSTYPE cgroup +s6-envdir -i /etc/s6/env/mount.dev-cgroup +export DEST /dev/cgroup +export FSTYPE cgroup2 -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/down b/main/nnd-s6-services/rc/mount.dev-hugepages/down index da74387..640eaec 100644 --- a/main/nnd-s6-services/rc/mount.dev-hugepages/down +++ b/main/nnd-s6-services/rc/mount.dev-hugepages/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /dev/hugepages -export PATH $PATH -define DEST /dev/hugepages - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.dev-hugepages/up b/main/nnd-s6-services/rc/mount.dev-hugepages/up index 8c2da5e..4bc998e 100644 --- a/main/nnd-s6-services/rc/mount.dev-hugepages/up +++ b/main/nnd-s6-services/rc/mount.dev-hugepages/up @@ -1,21 +1,6 @@ #!/bin/execlineb -P -define DEST /dev/hugepages -define CLEANDEST dev-hugepages -define FSTYPE hugetlbfs +s6-envdir -i /etc/s6/env/mount.dev-hugepages +export DEST /dev/hugepages +export FSTYPE hugetlbfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/down b/main/nnd-s6-services/rc/mount.dev-mqueue/down index 155e773..0ea9fad 100644 --- a/main/nnd-s6-services/rc/mount.dev-mqueue/down +++ b/main/nnd-s6-services/rc/mount.dev-mqueue/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /dev/mqueue -export PATH $PATH -define DEST /dev/mqueue - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.dev-mqueue/up b/main/nnd-s6-services/rc/mount.dev-mqueue/up index 14e8a93..9599d46 100644 --- a/main/nnd-s6-services/rc/mount.dev-mqueue/up +++ b/main/nnd-s6-services/rc/mount.dev-mqueue/up @@ -1,21 +1,6 @@ #!/bin/execlineb -P -define DEST /dev/mqueue -define CLEANDEST dev-mqueue -define FSTYPE mqueue +s6-envdir -i /etc/s6/env/mount.dev-mqueue +export DEST /dev/mqueue +export FSTYPE mqueue -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS mqueue $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-pts/down b/main/nnd-s6-services/rc/mount.dev-pts/down index f50b468..b0d548a 100644 --- a/main/nnd-s6-services/rc/mount.dev-pts/down +++ b/main/nnd-s6-services/rc/mount.dev-pts/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /dev/pts -export PATH $PATH -define DEST /dev/pts - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.dev-pts/up b/main/nnd-s6-services/rc/mount.dev-pts/up index 12e392b..1ed1904 100644 --- a/main/nnd-s6-services/rc/mount.dev-pts/up +++ b/main/nnd-s6-services/rc/mount.dev-pts/up @@ -1,26 +1,6 @@ #!/bin/execlineb -P -define DEST /dev/pts -define CLEANDEST dev-pts -define FSTYPE devpts +s6-envdir -i /etc/s6/env/mount.dev-pts +export DEST /dev/pts +export FSTYPE devpts -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -# TODO: Handle PTS being potentially mounted ahead of service execution (initrd) -foreground { - foreground { - exec mkdir -p $DEST - } exec mount -t $FSTYPE -o $OPTS pts $DEST -} if -nt { - importas status ? test $status -eq 1 -} +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev-shm/down b/main/nnd-s6-services/rc/mount.dev-shm/down index 2190a57..c5e4238 100644 --- a/main/nnd-s6-services/rc/mount.dev-shm/down +++ b/main/nnd-s6-services/rc/mount.dev-shm/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /dev/shm -export PATH $PATH -define DEST /dev/shm - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.dev-shm/up b/main/nnd-s6-services/rc/mount.dev-shm/up index bb8db34..7b42485 100644 --- a/main/nnd-s6-services/rc/mount.dev-shm/up +++ b/main/nnd-s6-services/rc/mount.dev-shm/up @@ -1,21 +1,6 @@ #!/bin/execlineb -P -define DEST /dev/shm -define CLEANDEST dev-shm -define FSTYPE tmpfs +s6-envdir -i /etc/s6/env/mount.dev-shm +export DEST /dev/shm +export FSTYPE tmpfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS shm $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.dev/down b/main/nnd-s6-services/rc/mount.dev/down index 5e825d4..0756c46 100644 --- a/main/nnd-s6-services/rc/mount.dev/down +++ b/main/nnd-s6-services/rc/mount.dev/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /dev -export PATH $PATH -define DEST /dev - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.dev/up b/main/nnd-s6-services/rc/mount.dev/up index 5c8e641..13032e4 100644 --- a/main/nnd-s6-services/rc/mount.dev/up +++ b/main/nnd-s6-services/rc/mount.dev/up @@ -1,26 +1,6 @@ #!/bin/execlineb -P -define DEST /dev -define CLEANDEST dev -define FSTYPE devtmpfs +s6-envdir -i /etc/s6/env/mount.dev +export DEST /dev +export FSTYPE devtmpfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -# TODO: Handle devtmpfs being potentially mounted ahead of service execution (initrd) -foreground { - foreground { - exec mkdir -p $DEST - } exec mount -t $FSTYPE -o $OPTS devtmpfs $DEST -} if -nt { - importas status ? test $status -eq 1 -} +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.proc/down b/main/nnd-s6-services/rc/mount.proc/down index 9360985..9fe176d 100644 --- a/main/nnd-s6-services/rc/mount.proc/down +++ b/main/nnd-s6-services/rc/mount.proc/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /proc -export PATH $PATH -define DEST /proc - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.proc/up b/main/nnd-s6-services/rc/mount.proc/up index 92d9a11..dcadf11 100644 --- a/main/nnd-s6-services/rc/mount.proc/up +++ b/main/nnd-s6-services/rc/mount.proc/up @@ -1,26 +1,6 @@ #!/bin/execlineb -P -define DEST /proc -define CLEANDEST proc -define FSTYPE procfs +s6-envdir -i /etc/s6/env/mount.proc +export DEST /proc +export FSTYPE proc -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -# TODO: Handle procfs being potentially mounted ahead of service execution (initrd) -foreground { - foreground { - exec mkdir -p $DEST - } exec mount -t $FSTYPE -o $OPTS procfs $DEST -} if -nt { - importas status ? test $status -eq 1 -} +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.root/down b/main/nnd-s6-services/rc/mount.root/down index 575f76a..6434c30 100644 --- a/main/nnd-s6-services/rc/mount.root/down +++ b/main/nnd-s6-services/rc/mount.root/down @@ -1,13 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST / -export PATH $PATH -define DEST / -define OPTS remount,ro - -fdclose 1 -fdclose 2 - -exec mount -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.root/up b/main/nnd-s6-services/rc/mount.root/up index 5b2b523..b812f63 100644 --- a/main/nnd-s6-services/rc/mount.root/up +++ b/main/nnd-s6-services/rc/mount.root/up @@ -1,15 +1,5 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +s6-envdir -i /etc/s6/env/mount.root +export DEST / -export PATH $PATH -define DEST / -define OPTS remount,rw - -fdclose 1 -fdclose 2 - -foreground { - mkdir -p $DEST -} mount -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.run/down b/main/nnd-s6-services/rc/mount.run/down index 911f36b..2a0d355 100644 --- a/main/nnd-s6-services/rc/mount.run/down +++ b/main/nnd-s6-services/rc/mount.run/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /run -export PATH $PATH -define DEST /run - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.run/up b/main/nnd-s6-services/rc/mount.run/up index 3c73aca..6becedc 100644 --- a/main/nnd-s6-services/rc/mount.run/up +++ b/main/nnd-s6-services/rc/mount.run/up @@ -1,26 +1,6 @@ #!/bin/execlineb -P -define DEST /run -define CLEANDEST run -define FSTYPE tmpfs +s6-envdir -i /etc/s6/env/mount.run +export DEST /run +export FSTYPE tmpfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -# TODO: Handle tmpfs being potentially mounted ahead of service execution (initrd) -foreground { - foreground { - exec mkdir -p $DEST - } exec mount -t $FSTYPE -o $OPTS run $DEST -} if -nt { - importas status ? test $status -eq 1 -} +exec /usr/libexec/nnd/s6/mount 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 index eca3ad6..f3c9f46 100644 --- a/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down +++ b/main/nnd-s6-services/rc/mount.sys-firmware-efi-efivars/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /sys/firmware/efi/efivars -export PATH $PATH -define DEST /sys/firmware/efi/efivars - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount 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 fe07f4f..83715e8 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,21 +1,6 @@ #!/bin/execlineb -P -define DEST /sys/firmware/efi/efivars -define CLEANDEST sys-firmware-efi-efivars -define FSTYPE efivarfs +s6-envdir -i /etc/s6/env/mount.sys-firmware-efi-efivars +export DEST /sys/firmware/efi/efivars +export FSTYPE efivarfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-fs-pstore/down b/main/nnd-s6-services/rc/mount.sys-fs-pstore/down index 9723115..e06c733 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/down +++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /sys/fs/pstore -export PATH $PATH -define DEST /sys/fs/pstore - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount 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 c4a783a..ea2c3dd 100644 --- a/main/nnd-s6-services/rc/mount.sys-fs-pstore/up +++ b/main/nnd-s6-services/rc/mount.sys-fs-pstore/up @@ -1,21 +1,6 @@ #!/bin/execlineb -P -define DEST /sys/fs/pstore -define CLEANDEST sys-fs-pstore -define FSTYPE pstore +s6-envdir -i /etc/s6/env/mount.sys-fs-pstore +export DEST /sys/fs/pstore +export FSTYPE pstore -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys-kernel-security/down b/main/nnd-s6-services/rc/mount.sys-kernel-security/down index 8fb60f8..414474e 100644 --- a/main/nnd-s6-services/rc/mount.sys-kernel-security/down +++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /sys/kernel/security -export PATH $PATH -define DEST /sys/kernel/security - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount 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 4d73a3c..4492255 100644 --- a/main/nnd-s6-services/rc/mount.sys-kernel-security/up +++ b/main/nnd-s6-services/rc/mount.sys-kernel-security/up @@ -1,21 +1,6 @@ #!/bin/execlineb -P -define DEST /sys/kernel/security -define CLEANDEST sys-kernel-security -define FSTYPE securityfs +s6-envdir -i /etc/s6/env/mount.sys-kernel-security +export DEST /sys/kernel/security +export FSTYPE securityfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS none $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.sys/down b/main/nnd-s6-services/rc/mount.sys/down index e321839..8adb00f 100644 --- a/main/nnd-s6-services/rc/mount.sys/down +++ b/main/nnd-s6-services/rc/mount.sys/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /sys -export PATH $PATH -define DEST /sys - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.sys/up b/main/nnd-s6-services/rc/mount.sys/up index 80f7c9c..08289db 100644 --- a/main/nnd-s6-services/rc/mount.sys/up +++ b/main/nnd-s6-services/rc/mount.sys/up @@ -1,26 +1,6 @@ #!/bin/execlineb -P -define DEST /sys -define CLEANDEST sys -define FSTYPE sysfs +s6-envdir -i /etc/s6/env/mount.sys +export DEST /sys +export FSTYPE sysfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -# TODO: Handle sysfs being potentially mounted ahead of service execution (initrd) -foreground { - foreground { - exec mkdir -p $DEST - } exec mount -t $FSTYPE -o $OPTS sysfs $DEST -} if -nt { - importas status ? test $status -eq 1 -} +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.tmp/down b/main/nnd-s6-services/rc/mount.tmp/down index 17549f0..2b2082e 100644 --- a/main/nnd-s6-services/rc/mount.tmp/down +++ b/main/nnd-s6-services/rc/mount.tmp/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /tmp -export PATH $PATH -define DEST /tmp - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount diff --git a/main/nnd-s6-services/rc/mount.tmp/up b/main/nnd-s6-services/rc/mount.tmp/up index b8f8fee..1055241 100644 --- a/main/nnd-s6-services/rc/mount.tmp/up +++ b/main/nnd-s6-services/rc/mount.tmp/up @@ -1,26 +1,6 @@ #!/bin/execlineb -P -define DEST /tmp -define CLEANDEST tmp -define FSTYPE tmpfs +s6-envdir -i /etc/s6/env/mount.tmp +export DEST /tmp +export FSTYPE tmpfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -# TODO: Handle tmpfs being potentially mounted ahead of service execution (initrd) -foreground { - foreground { - exec mkdir -p $DEST - } exec mount -t $FSTYPE -o $OPTS tmp $DEST -} if -nt { - importas status ? test $status -eq 1 -} +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/dependencies.d/mount.root b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/dependencies.d/mount.root new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down index 0206fa8..2fa0fba 100644 --- a/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down +++ b/main/nnd-s6-services/rc/mount.var-lib-ceph-osd-ceph-0/down @@ -1,12 +1,4 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export DEST /var/lib/ceph/osd/ceph-0 -export PATH $PATH -define DEST /var/lib/ceph/osd/ceph-0 - -fdclose 1 -fdclose 2 - -exec umount $DEST +exec /usr/libexec/nnd/s6/umount 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 3b47d9f..319676c 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,21 +1,6 @@ #!/bin/execlineb -P -define DEST /var/lib/ceph/osd/ceph-0 -define CLEANDEST var-lib-ceph-osd-ceph-0 -define FSTYPE tmpfs +s6-envdir -I /etc/s6/env/mount.var-lib-ceph-osd-ceph-0 +export DEST /var/lib/ceph/osd/ceph-0 +export FSTYPE tmpfs -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/mount.${CLEANDEST} -importas -i OPTS OPTS - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -foreground { - exec mkdir -p $DEST -} exec mount -t $FSTYPE -o $OPTS tmpfs $DEST +exec /usr/libexec/nnd/s6/mount diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down index 54c7eda..abc694e 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down +++ b/main/nnd-s6-services/rc/sys.kernel-mm-ksm-run/down @@ -1,13 +1,5 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export SYSPATH kernel/mm/ksm/run +export VAL 0 -export PATH $PATH -define FPATH /sys/kernel/mm/ksm/run -define VAL 0 - -fdclose 1 -fdclose 2 - -redirfd -w 1 $FPATH echo $VAL +exec /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 6e86528..710c292 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,18 +1,5 @@ #!/bin/execlineb -P -define FPATH kernel/mm/ksm/run -define CLEANPATH kernel-mm-ksm-run +s6-envdir -i /etc/s6/env/sys.kernel-mm-ksm-run +export SYSPATH kernel/mm/ksm/run -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/sys.${CLEANPATH} -importas -i VAL VAL - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -redirfd -w 1 /sys/${FPATH} echo $VAL +exec /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down index 31b94e6..f83350e 100644 --- a/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down +++ b/main/nnd-s6-services/rc/sys.kernel-mm-transparent_hugepage-enabled/down @@ -1,13 +1,5 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv - -export PATH $PATH -define FPATH /sys/kernel/mm/transparent_hugepage/enabled +export SYSPATH kernel/mm/transparent_hugepage/enabled define VAL never -fdclose 1 -fdclose 2 - -redirfd -w 1 $FPATH echo $VAL +exec /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 2e04d65..0d76028 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,18 +1,5 @@ #!/bin/execlineb -P -define FPATH kernel/mm/transparent_hugepage/enabled -define CLEANPATH kernel-mm-transparent_hugepage-enabled +s6-envdir -i /etc/s6/env/sys.kernel-mm-transparent_hugepage-enabled +export SYSPATH kernel/mm/transparent_hugepage/enabled -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/sys.${CLEANPATH} -importas -i VAL VAL - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -redirfd -w 1 /sys/${FPATH} echo $VAL +exec /usr/libexec/nnd/s6/sysfs diff --git a/main/nnd-s6-services/rc/sysctl.kernel-hostname/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.kernel-hostname/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/hostname/type b/main/nnd-s6-services/rc/sysctl.kernel-hostname/type similarity index 100% rename from main/nnd-s6-services/rc/hostname/type rename to main/nnd-s6-services/rc/sysctl.kernel-hostname/type diff --git a/main/nnd-s6-services/rc/sysctl.kernel-hostname/up b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up new file mode 100644 index 0000000..98f21d0 --- /dev/null +++ b/main/nnd-s6-services/rc/sysctl.kernel-hostname/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/sysctl.kernel-hostname +export SYSCTL kernel/hostname + +exec /usr/libexec/nnd/s6/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.proc b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/dependencies.d/mount.proc new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down index a2b36b6..3f663f6 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down +++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/down @@ -1,13 +1,5 @@ #!/bin/execlineb -P -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH -emptyenv +export SYSCTL vm/nr_hugepages +export VAL 0 -export PATH $PATH -define SYSCTL vm/nr_hugepages -define VAL 0 - -fdclose 1 -fdclose 2 - -exec sysctl -w ${SYSCTL}=${VAL} +exec /usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up index 5ce54df..e7c5059 100644 --- a/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up +++ b/main/nnd-s6-services/rc/sysctl.vm-nr_hugepages/up @@ -1,18 +1,5 @@ #!/bin/execlineb -P -define SYSCTL vm/nr_hugepages -define CLEANPATH vm-nr_hugepages +s6-envdir -i /etc/s6/env/sysctl.vm-nr_hugepages +export SYSCTL vm/nr_hugepages -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/sysctl.${CLEANPATH} -importas -i VAL VAL - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec sysctl -w ${SYSCTL}=${VAL} +exec /usr/libexec/nnd/sysctl diff --git a/main/nnd-s6-services/rc/syslogd/dependencies.d/sysctl.kernel-hostname b/main/nnd-s6-services/rc/syslogd/dependencies.d/sysctl.kernel-hostname new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/virtinterfaced/run b/main/nnd-s6-services/rc/virtinterfaced/run deleted file mode 100755 index 13343b2..0000000 --- a/main/nnd-s6-services/rc/virtinterfaced/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE interface - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtlockd/run b/main/nnd-s6-services/rc/virtlockd/run deleted file mode 100755 index b55e0e0..0000000 --- a/main/nnd-s6-services/rc/virtlockd/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE lock - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtlogd/run b/main/nnd-s6-services/rc/virtlogd/run deleted file mode 100755 index 803e8a9..0000000 --- a/main/nnd-s6-services/rc/virtlogd/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE log - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtlxcd/run b/main/nnd-s6-services/rc/virtlxcd/run deleted file mode 100755 index 3bba303..0000000 --- a/main/nnd-s6-services/rc/virtlxcd/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE lxc - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtnetworkd/run b/main/nnd-s6-services/rc/virtnetworkd/run deleted file mode 100755 index 84dd5dd..0000000 --- a/main/nnd-s6-services/rc/virtnetworkd/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE network - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtnodedevd/run b/main/nnd-s6-services/rc/virtnodedevd/run deleted file mode 100755 index 1654fe7..0000000 --- a/main/nnd-s6-services/rc/virtnodedevd/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE nodedev - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtproxyd/run b/main/nnd-s6-services/rc/virtproxyd/run deleted file mode 100755 index 9d29f6f..0000000 --- a/main/nnd-s6-services/rc/virtproxyd/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE proxy - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtqemud/run b/main/nnd-s6-services/rc/virtqemud/run deleted file mode 100755 index 6f55d98..0000000 --- a/main/nnd-s6-services/rc/virtqemud/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE qemu - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/rc/virtstoraged/run b/main/nnd-s6-services/rc/virtstoraged/run deleted file mode 100755 index c3625db..0000000 --- a/main/nnd-s6-services/rc/virtstoraged/run +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/execlineb -P -define SERVICE storage - -s6-envdir -i /etc/s6/env/path -importas -i PATH PATH - -s6-envdir -i /etc/s6/env/virt${SERVICE}d -importas -i CONFIG CONFIG - -emptyenv - -export PATH $PATH - -fdclose 1 -fdclose 2 - -exec virt${SERVICE}d diff --git a/main/nnd-s6-services/tmpl/ceph b/main/nnd-s6-services/tmpl/ceph new file mode 100755 index 0000000..c923b34 --- /dev/null +++ b/main/nnd-s6-services/tmpl/ceph @@ -0,0 +1,17 @@ +#!/bin/execlineb -W +importas -i DAEMON DAEMON +importas -i ID ID + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +s6-envdir -I /etc/s6/env/ceph +importas -D "/etc/ceph/ceph.conf" CONFIG CONFIG + +emptyenv +export PATH $PATH + +# Log everything to stdout +fdmove -c 2 1 + +exec ceph-${DAEMON} -d -i $ID -c $CONFIG diff --git a/main/nnd-s6-services/tmpl/dir b/main/nnd-s6-services/tmpl/dir new file mode 100755 index 0000000..2a28af3 --- /dev/null +++ b/main/nnd-s6-services/tmpl/dir @@ -0,0 +1,10 @@ +#!/bin/execlineb -W +importas -i DIR DIR + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +exec mkdir -p $DIR diff --git a/main/nnd-s6-services/tmpl/getty b/main/nnd-s6-services/tmpl/getty new file mode 100755 index 0000000..5a1cb0b --- /dev/null +++ b/main/nnd-s6-services/tmpl/getty @@ -0,0 +1,13 @@ +#!/bin/execlineb -W +importas -i TTY TTY + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +s6-envdir -I /etc/s6/env/getty.${TTY} +importas -D 0 BAUD BAUD + +emptyenv +export PATH $PATH + +exec getty $BAUD $TTY diff --git a/main/nnd-s6-services/tmpl/libvirtd b/main/nnd-s6-services/tmpl/libvirtd new file mode 100755 index 0000000..e54c8a3 --- /dev/null +++ b/main/nnd-s6-services/tmpl/libvirtd @@ -0,0 +1,16 @@ +#!/bin/execlineb -W +importas -i NAME NAME + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +s6-envdir -I /etc/s6/env/libvirt +importas -D "/etc/libvirt/virt${NAME}d" CONFIG DEFAULTCONFIG + +s6-envdir -I /etc/s6/env/libvirt.${NAME} +importas -D $DEFAULTCONFIG CONFIG CONFIG + +emptyenv +export PATH $PATH + +exec virt${NAME}d -f $CONFIG -d diff --git a/main/nnd-s6-services/tmpl/logger b/main/nnd-s6-services/tmpl/logger new file mode 100755 index 0000000..38f5899 --- /dev/null +++ b/main/nnd-s6-services/tmpl/logger @@ -0,0 +1,19 @@ +#!/bin/execlineb -W +importas -i NAME NAME + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +s6-envdir -I /etc/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} +importas -D $DEFAULTSIZE SIZE SIZE +importas -D $DEFAULTARCHIVES ARCHIVES ARCHIVES + +emptyenv +export PATH $PATH + +exec 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 new file mode 100755 index 0000000..7b0da3c --- /dev/null +++ b/main/nnd-s6-services/tmpl/modprobe @@ -0,0 +1,10 @@ +#!/bin/execlineb -W +importas -i MODULE MODULE + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +exec modprobe $MODULE diff --git a/main/nnd-s6-services/tmpl/mount b/main/nnd-s6-services/tmpl/mount new file mode 100755 index 0000000..3e47748 --- /dev/null +++ b/main/nnd-s6-services/tmpl/mount @@ -0,0 +1,21 @@ +#!/bin/execlineb -W +importas -D "none" SRC SRC +importas -i DEST DEST +importas -i FSTYPE FSTYPE +importas -D "defaults" OPTS OPTS + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +foreground { mkdir -p $DEST } + +if -nt { + foreground { + s6-mount -t $FSTYPE -o $OPTS $SRC $DEST + } +} importas -i status ? { + if -nt { test $status -eq 1 } exit $status +} diff --git a/main/nnd-s6-services/tmpl/rmmod b/main/nnd-s6-services/tmpl/rmmod new file mode 100755 index 0000000..bc9fca1 --- /dev/null +++ b/main/nnd-s6-services/tmpl/rmmod @@ -0,0 +1,10 @@ +#!/bin/execlineb -W +importas -i MODULE MODULE + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +exec rmmod $MODULE diff --git a/main/nnd-s6-services/tmpl/symlink b/main/nnd-s6-services/tmpl/symlink new file mode 100755 index 0000000..1271e6a --- /dev/null +++ b/main/nnd-s6-services/tmpl/symlink @@ -0,0 +1,11 @@ +#!/bin/execlineb -W +importas -i SRC SRC +importas -i DEST DEST + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +exec ln -sn $DEST $SRC diff --git a/main/nnd-s6-services/tmpl/sysctl b/main/nnd-s6-services/tmpl/sysctl new file mode 100755 index 0000000..a6c3b3a --- /dev/null +++ b/main/nnd-s6-services/tmpl/sysctl @@ -0,0 +1,11 @@ +#!/bin/execlineb -W +importas -i SYSCTL SYSCTL +importas -i VAL VAL + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +redirfd -w 1 /proc/sys/${SYSCTL} exec echo $VAL diff --git a/main/nnd-s6-services/tmpl/sysfs b/main/nnd-s6-services/tmpl/sysfs new file mode 100755 index 0000000..711b146 --- /dev/null +++ b/main/nnd-s6-services/tmpl/sysfs @@ -0,0 +1,11 @@ +#!/bin/execlineb -W +importas -i SYSPATH SYSPATH +importas -i VAL VAL + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +redirfd -w 1 /sys/${SYSPATH} exec echo $VAL diff --git a/main/nnd-s6-services/tmpl/umount b/main/nnd-s6-services/tmpl/umount new file mode 100755 index 0000000..4b6e0d6 --- /dev/null +++ b/main/nnd-s6-services/tmpl/umount @@ -0,0 +1,10 @@ +#!/bin/execlineb -W +importas -i DEST DEST + +s6-envdir -I /etc/s6/env/path +importas -D "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" PATH PATH + +emptyenv +export PATH $PATH + +exec umount $DEST