28 files changed, 6 insertions, 15 deletions
diff --git a/examples/source/dns-cache/pipeline-name b/examples/source/dns-cache-log/pipeline-name
index f7a296f..f7a296f 100644
--- a/examples/source/dns-cache/pipeline-name
+++ b/examples/source/dns-cache-log/pipeline-name
diff --git a/examples/source/dns-server-tcp-4/pipeline-name b/examples/source/dns-server-tcp-4-log/pipeline-name
index b07d2e6..b07d2e6 100644
--- a/examples/source/dns-server-tcp-4/pipeline-name
+++ b/examples/source/dns-server-tcp-4-log/pipeline-name
diff --git a/examples/source/dns-server-udp/pipeline-name b/examples/source/dns-server-udp-log/pipeline-name
index e843883..e843883 100644
--- a/examples/source/dns-server-udp/pipeline-name
+++ b/examples/source/dns-server-udp-log/pipeline-name
diff --git a/examples/source/fdholder/pipeline-name b/examples/source/fdholder-log/pipeline-name
index 44be5e2..44be5e2 100644
--- a/examples/source/fdholder/pipeline-name
+++ b/examples/source/fdholder-log/pipeline-name
diff --git a/examples/source/hostapd/pipeline-name b/examples/source/hostapd-log/pipeline-name
index ce1e711..ce1e711 100644
--- a/examples/source/hostapd/pipeline-name
+++ b/examples/source/hostapd-log/pipeline-name
diff --git a/examples/source/httpd-4/pipeline-name b/examples/source/httpd-4-log/pipeline-name
index 291f119..291f119 100644
--- a/examples/source/httpd-4/pipeline-name
+++ b/examples/source/httpd-4-log/pipeline-name
diff --git a/examples/source/identd-4/pipeline-name b/examples/source/identd-4-log/pipeline-name
index 72bb98e..72bb98e 100644
--- a/examples/source/identd-4/pipeline-name
+++ b/examples/source/identd-4-log/pipeline-name
diff --git a/examples/source/init-coldplug/dependencies b/examples/source/init-coldplug/dependencies
index c79dcde..81fa7ad 100644
--- a/examples/source/init-coldplug/dependencies
+++ b/examples/source/init-coldplug/dependencies
@@ -1,3 +1,3 @@
 init-devtmpfs
 mount-sys
-mdevd-pipeline
+mdevd
diff --git a/examples/source/init-coldplug/up b/examples/source/init-coldplug/up
index fed6638..edc5c1b 100644
--- a/examples/source/init-coldplug/up
+++ b/examples/source/init-coldplug/up
@@ -1 +1 @@
-mdev -s
+mdevd-coldplug
diff --git a/examples/source/klogd-srv/pipeline-name b/examples/source/klogd-log/pipeline-name
index fd64770..fd64770 100644
--- a/examples/source/klogd-srv/pipeline-name
+++ b/examples/source/klogd-log/pipeline-name
diff --git a/examples/source/mdevd-listener/dependencies b/examples/source/mdevd-listener/dependencies
deleted file mode 100644
index f23f767..0000000
--- a/examples/source/mdevd-listener/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-devtmpfs
diff --git a/examples/source/mdevd-listener/pipeline-name b/examples/source/mdevd-listener/pipeline-name
deleted file mode 100644
index 0d284a9..0000000
--- a/examples/source/mdevd-listener/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-mdevd-pipeline
diff --git a/examples/source/mdevd-listener/producer-for b/examples/source/mdevd-listener/producer-for
deleted file mode 100644
index 3252ded..0000000
--- a/examples/source/mdevd-listener/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-mdevd
diff --git a/examples/source/mdevd-listener/run b/examples/source/mdevd-listener/run
deleted file mode 100755
index db99ae9..0000000
--- a/examples/source/mdevd-listener/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/command/execlineb -P
-fdmove -c 2 1
-exec -c
-s6-uevent-listener
diff --git a/examples/source/mdevd-listener/type b/examples/source/mdevd-listener/type
deleted file mode 100644
index 5883cff..0000000
--- a/examples/source/mdevd-listener/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
diff --git a/examples/source/mdevd/consumer-for b/examples/source/mdevd/consumer-for
deleted file mode 100644
index c37e40d..0000000
--- a/examples/source/mdevd/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-mdevd-listener
diff --git a/examples/source/mdevd/notification-fd b/examples/source/mdevd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/examples/source/mdevd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/examples/source/mdevd/run b/examples/source/mdevd/run
index a8542c0..7144bc9 100755
--- a/examples/source/mdevd/run
+++ b/examples/source/mdevd/run
@@ -1,5 +1,4 @@
 #!/command/execlineb -P
-fdmove -c 2 1
 exec -c
-s6-uevent-spawner
-/bin/mdev
+export PATH /command:/bin
+mdevd -D 3
diff --git a/examples/source/ntpclient/pipeline-name b/examples/source/ntpclient-log/pipeline-name
index f9615f1..f9615f1 100644
--- a/examples/source/ntpclient/pipeline-name
+++ b/examples/source/ntpclient-log/pipeline-name
diff --git a/examples/source/ok-local/contents b/examples/source/ok-local/contents
index 4e44ed6..b68938f 100644
--- a/examples/source/ok-local/contents
+++ b/examples/source/ok-local/contents
@@ -1,4 +1,4 @@
-mdevd-pipeline
+mdevd
 syslogd
 klogd
 fdholder
diff --git a/examples/source/qmail/pipeline-name b/examples/source/qmail-log/pipeline-name
index 2d4eee2..2d4eee2 100644
--- a/examples/source/qmail/pipeline-name
+++ b/examples/source/qmail-log/pipeline-name
diff --git a/examples/source/qmtpd-4/pipeline-name b/examples/source/qmtpd-4-log/pipeline-name
index 9bd7810..9bd7810 100644
--- a/examples/source/qmtpd-4/pipeline-name
+++ b/examples/source/qmtpd-4-log/pipeline-name
diff --git a/examples/source/smtpd-4/pipeline-name b/examples/source/smtpd-4-log/pipeline-name
index 8cf1070..8cf1070 100644
--- a/examples/source/smtpd-4/pipeline-name
+++ b/examples/source/smtpd-4-log/pipeline-name
diff --git a/examples/source/sshd-4/pipeline-name b/examples/source/sshd-4-log/pipeline-name
index d46bed2..d46bed2 100644
--- a/examples/source/sshd-4/pipeline-name
+++ b/examples/source/sshd-4-log/pipeline-name
diff --git a/examples/source/syslogd-srv/pipeline-name b/examples/source/syslogd-log/pipeline-name
index 96c5cc7..96c5cc7 100644
--- a/examples/source/syslogd-srv/pipeline-name
+++ b/examples/source/syslogd-log/pipeline-name
diff --git a/examples/source/taiclockd-4/pipeline-name b/examples/source/taiclockd-4-log/pipeline-name
index b8ef1d0..b8ef1d0 100644
--- a/examples/source/taiclockd-4/pipeline-name
+++ b/examples/source/taiclockd-4-log/pipeline-name
diff --git a/examples/source/udhcpc-eth3/pipeline-name b/examples/source/udhcpc-eth3-log/pipeline-name
index f8bcba7..f8bcba7 100644
--- a/examples/source/udhcpc-eth3/pipeline-name
+++ b/examples/source/udhcpc-eth3-log/pipeline-name
diff --git a/examples/source/udhcpd-wlan0/pipeline-name b/examples/source/udhcpd-wlan0-log/pipeline-name
index bf20ff6..bf20ff6 100644
--- a/examples/source/udhcpd-wlan0/pipeline-name
+++ b/examples/source/udhcpd-wlan0-log/pipeline-name