diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/mdevd b/main/nnd-s6-services/rc/bundle.core/contents.d/bundle.hw-coldplug similarity index 100% rename from main/nnd-s6-services/rc/bundle.core/contents.d/mdevd rename to main/nnd-s6-services/rc/bundle.core/contents.d/bundle.hw-coldplug diff --git a/main/nnd-s6-services/rc/bundle.core/contents.d/mdevd.coldplug b/main/nnd-s6-services/rc/bundle.hw-coldplug/contents.d/mdevd.coldplug similarity index 100% rename from main/nnd-s6-services/rc/bundle.core/contents.d/mdevd.coldplug rename to main/nnd-s6-services/rc/bundle.hw-coldplug/contents.d/mdevd.coldplug diff --git a/main/nnd-s6-services/rc/bundle.hw-coldplug/type b/main/nnd-s6-services/rc/bundle.hw-coldplug/type new file mode 100644 index 0000000..757b422 --- /dev/null +++ b/main/nnd-s6-services/rc/bundle.hw-coldplug/type @@ -0,0 +1 @@ +bundle diff --git a/main/nnd-s6-services/rc/interface.eth0.ready/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.stopall similarity index 100% rename from main/nnd-s6-services/rc/interface.eth0.ready/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/bundle.libvirt/contents.d/libvirt.stopall diff --git a/main/nnd-s6-services/rc/libvirt.interface/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/interface.eth0.ready/dependencies.d/bundle.hw-coldplug similarity index 100% rename from main/nnd-s6-services/rc/libvirt.interface/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/interface.eth0.ready/dependencies.d/bundle.hw-coldplug diff --git a/main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/libvirt.interface/dependencies.d/bundle.hw-coldplug similarity index 100% rename from main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/libvirt.interface/dependencies.d/bundle.hw-coldplug diff --git a/main/nnd-s6-services/rc/nameif/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/bundle.hw-coldplug similarity index 100% rename from main/nnd-s6-services/rc/nameif/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/libvirt.nodedev/dependencies.d/bundle.hw-coldplug diff --git a/main/nnd-s6-services/rc/qemu-ga/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/libvirt.stopall/dependencies.d/libvirt.qemu similarity index 100% rename from main/nnd-s6-services/rc/qemu-ga/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/libvirt.stopall/dependencies.d/libvirt.qemu diff --git a/main/nnd-s6-services/rc/libvirt.stopall/down b/main/nnd-s6-services/rc/libvirt.stopall/down new file mode 100644 index 0000000..5df8c24 --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.stopall/down @@ -0,0 +1,6 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +emptyenv -p + +pipeline { virsh list --name --all --state-running --state-paused --state-other } + forstdin -E -C -p DOMAIN virsh destroy $DOMAIN diff --git a/main/nnd-s6-services/rc/libvirt.stopall/type b/main/nnd-s6-services/rc/libvirt.stopall/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/libvirt.stopall/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/smartd/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/libvirt.stopall/up similarity index 100% rename from main/nnd-s6-services/rc/smartd/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/libvirt.stopall/up diff --git a/main/nnd-s6-services/rc/logger.udevd/consumer-for b/main/nnd-s6-services/rc/logger.udevd/consumer-for new file mode 100644 index 0000000..45bd63d --- /dev/null +++ b/main/nnd-s6-services/rc/logger.udevd/consumer-for @@ -0,0 +1 @@ +udevd diff --git a/main/nnd-s6-services/rc/vg.Backplane/dependencies.d/mdevd.coldplug b/main/nnd-s6-services/rc/logger.udevd/dependencies.d/dir.var-log similarity index 100% rename from main/nnd-s6-services/rc/vg.Backplane/dependencies.d/mdevd.coldplug rename to main/nnd-s6-services/rc/logger.udevd/dependencies.d/dir.var-log diff --git a/main/nnd-s6-services/rc/logger.udevd/notification-fd b/main/nnd-s6-services/rc/logger.udevd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/logger.udevd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/logger.udevd/run b/main/nnd-s6-services/rc/logger.udevd/run new file mode 100755 index 0000000..325f2e4 --- /dev/null +++ b/main/nnd-s6-services/rc/logger.udevd/run @@ -0,0 +1,4 @@ +#!/bin/execlineb -P +export NAME udevd + +/usr/libexec/nnd/s6/logger diff --git a/main/nnd-s6-services/rc/logger.udevd/type b/main/nnd-s6-services/rc/logger.udevd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/logger.udevd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/multipathd/run b/main/nnd-s6-services/rc/multipathd/run index 67d05f1..6e605c8 100755 --- a/main/nnd-s6-services/rc/multipathd/run +++ b/main/nnd-s6-services/rc/multipathd/run @@ -2,4 +2,6 @@ s6-envdir -i /etc/s6/env/path emptyenv -p +fdmove -c 2 1 + multipathd -d -v 3 diff --git a/main/nnd-s6-services/rc/nameif/dependencies.d/bundle.hw-coldplug b/main/nnd-s6-services/rc/nameif/dependencies.d/bundle.hw-coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/qemu-ga/dependencies.d/bundle.hw-coldplug b/main/nnd-s6-services/rc/qemu-ga/dependencies.d/bundle.hw-coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/smartd/dependencies.d/bundle.hw-coldplug b/main/nnd-s6-services/rc/smartd/dependencies.d/bundle.hw-coldplug new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/udevd.settle/dependencies.d/udevd.trigger b/main/nnd-s6-services/rc/udevd.settle/dependencies.d/udevd.trigger new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/udevd.settle/type b/main/nnd-s6-services/rc/udevd.settle/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/udevd.settle/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/udevd.settle/up b/main/nnd-s6-services/rc/udevd.settle/up new file mode 100644 index 0000000..e8cf82c --- /dev/null +++ b/main/nnd-s6-services/rc/udevd.settle/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +emptyenv -p + +udevadm settle diff --git a/main/nnd-s6-services/rc/udevd.trigger/dependencies.d/udevd b/main/nnd-s6-services/rc/udevd.trigger/dependencies.d/udevd new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/udevd.trigger/type b/main/nnd-s6-services/rc/udevd.trigger/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/main/nnd-s6-services/rc/udevd.trigger/type @@ -0,0 +1 @@ +oneshot diff --git a/main/nnd-s6-services/rc/udevd.trigger/up b/main/nnd-s6-services/rc/udevd.trigger/up new file mode 100644 index 0000000..446bd74 --- /dev/null +++ b/main/nnd-s6-services/rc/udevd.trigger/up @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +emptyenv -p + +udevadm trigger diff --git a/main/nnd-s6-services/rc/udevd/dependencies.d/mount.dev b/main/nnd-s6-services/rc/udevd/dependencies.d/mount.dev new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/udevd/dependencies.d/mount.sys b/main/nnd-s6-services/rc/udevd/dependencies.d/mount.sys new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/udevd/flag-essential b/main/nnd-s6-services/rc/udevd/flag-essential new file mode 100644 index 0000000..e69de29 diff --git a/main/nnd-s6-services/rc/udevd/notification-fd b/main/nnd-s6-services/rc/udevd/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/main/nnd-s6-services/rc/udevd/notification-fd @@ -0,0 +1 @@ +3 diff --git a/main/nnd-s6-services/rc/udevd/producer-for b/main/nnd-s6-services/rc/udevd/producer-for new file mode 100644 index 0000000..6de4699 --- /dev/null +++ b/main/nnd-s6-services/rc/udevd/producer-for @@ -0,0 +1 @@ +logger.udevd diff --git a/main/nnd-s6-services/rc/udevd/run b/main/nnd-s6-services/rc/udevd/run new file mode 100755 index 0000000..6db21b3 --- /dev/null +++ b/main/nnd-s6-services/rc/udevd/run @@ -0,0 +1,5 @@ +#!/bin/execlineb -P +s6-envdir -i /etc/s6/env/path +emptyenv -p + +udevd diff --git a/main/nnd-s6-services/rc/udevd/type b/main/nnd-s6-services/rc/udevd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/main/nnd-s6-services/rc/udevd/type @@ -0,0 +1 @@ +longrun diff --git a/main/nnd-s6-services/rc/vg.Backplane/dependencies.d/bundle.hw-coldplug b/main/nnd-s6-services/rc/vg.Backplane/dependencies.d/bundle.hw-coldplug new file mode 100644 index 0000000..e69de29