diff options
Diffstat (limited to 'layout')
15 files changed, 15 insertions, 7 deletions
diff --git a/layout/initramfs/init b/layout/initramfs/init index 0a7f2de..7c4c681 100755 --- a/layout/initramfs/init +++ b/layout/initramfs/init @@ -12,7 +12,7 @@ if { s6-mount -wt sysfs sys /sys } if { s6-mount -wt proc proc /proc } if { s6-mount -wt devtmpfs dev /dev } -if { /sbin/mdev -s } +if { pipeline { mdevd-coldplug } mdevd } if { s6-mount -rt ext4 /dev/%%PARTITION%%1 /rootfs } diff --git a/layout/initramfs/sbin/.empty b/layout/initramfs/sbin/.empty deleted file mode 100644 index e69de29..0000000 --- a/layout/initramfs/sbin/.empty +++ /dev/null diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies index 0b3e805..c1ee812 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies +++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies @@ -1 +1 @@ -devd +init-dev diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up index fed6638..8d668da 100644 --- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up +++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up @@ -1 +1 @@ -mdev -s +pipeline { mdevd-coldplug } mdevd diff --git a/layout/rootfs/etc/s6-rc/source-base/devd/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies index c1ee812..c1ee812 100644 --- a/layout/rootfs/etc/s6-rc/source-base/devd/dependencies +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd @@ -0,0 +1 @@ +3 diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name new file mode 100644 index 0000000..0d284a9 --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name @@ -0,0 +1 @@ +mdevd-pipeline diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for new file mode 100644 index 0000000..3252ded --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for @@ -0,0 +1 @@ +mdevd diff --git a/layout/rootfs/etc/s6-rc/source-base/devd/run b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run index f9bda39..aa30b24 100755 --- a/layout/rootfs/etc/s6-rc/source-base/devd/run +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run @@ -1,5 +1,3 @@ #!/command/execlineb -P -fdmove -c 2 1 exec -c -s6-devd -/bin/mdev +mdevd-netlink -d 3 diff --git a/layout/rootfs/etc/s6-rc/source-base/devd/type b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type index 5883cff..5883cff 100644 --- a/layout/rootfs/etc/s6-rc/source-base/devd/type +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for b/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for new file mode 100644 index 0000000..ca025df --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for @@ -0,0 +1 @@ +mdevd-netlink diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies new file mode 100644 index 0000000..c1ee812 --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies @@ -0,0 +1 @@ +init-dev diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/run b/layout/rootfs/etc/s6-rc/source-base/mdevd/run new file mode 100755 index 0000000..52b5fdc --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/run @@ -0,0 +1,4 @@ +#!/command/execlineb -P +exec -c +export PATH /command:/bin +mdevd diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/type b/layout/rootfs/etc/s6-rc/source-base/mdevd/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/type @@ -0,0 +1 @@ +longrun diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents index bcad911..242cfed 100644 --- a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents +++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents @@ -1,4 +1,4 @@ -devd +mdevd-pipeline syslogd-pipeline klogd-pipeline fdholder-pipeline |