16 files changed, 12 insertions, 13 deletions

diff --git a/examples/source/devd-log/consumer-for b/examples/source/devd-log/consumer-for
deleted file mode 100644
index 0b3e805..0000000
--- a/examples/source/devd-log/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-devd
diff --git a/examples/source/devd-log/dependencies b/examples/source/devd-log/dependencies
deleted file mode 100644
index e1436e2..0000000
--- a/examples/source/devd-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-sync
diff --git a/examples/source/devd-log/run b/examples/source/devd-log/run
deleted file mode 100755
index 2a5918f..0000000
--- a/examples/source/devd-log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/command/execlineb -P
-s6-setuidgid syslog
-exec -c
-s6-log t s1000000 n20 /var/log/devd
diff --git a/examples/source/devd/pipeline-name b/examples/source/devd/pipeline-name
deleted file mode 100644
index a40db1b..0000000
--- a/examples/source/devd/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-devd-pipeline
diff --git a/examples/source/devd/producer-for b/examples/source/devd/producer-for
deleted file mode 100644
index 09c60aa..0000000
--- a/examples/source/devd/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-devd-log
diff --git a/examples/source/init-coldplug/dependencies b/examples/source/init-coldplug/dependencies
index 9189f7f..c79dcde 100644
--- a/examples/source/init-coldplug/dependencies
+++ b/examples/source/init-coldplug/dependencies
@@ -1,3 +1,3 @@
 init-devtmpfs
 mount-sys
-devd
+mdevd-pipeline
diff --git a/examples/source/devd/dependencies b/examples/source/mdevd-listener/dependencies
index f0f7224..f23f767 100644
--- a/examples/source/devd/dependencies
+++ b/examples/source/mdevd-listener/dependencies
@@ -1,2 +1 @@
 init-devtmpfs
-mount-sys
diff --git a/examples/source/mdevd-listener/pipeline-name b/examples/source/mdevd-listener/pipeline-name
new file mode 100644
index 0000000..0d284a9
--- /dev/null
+++ b/examples/source/mdevd-listener/pipeline-name
@@ -0,0 +1 @@
+mdevd-pipeline
diff --git a/examples/source/mdevd-listener/producer-for b/examples/source/mdevd-listener/producer-for
new file mode 100644
index 0000000..3252ded
--- /dev/null
+++ b/examples/source/mdevd-listener/producer-for
@@ -0,0 +1 @@
+mdevd
diff --git a/examples/source/devd/run b/examples/source/mdevd-listener/run
index ad97de9..db99ae9 100755
--- a/examples/source/devd/run
+++ b/examples/source/mdevd-listener/run
@@ -1,5 +1,4 @@
 #!/command/execlineb -P
 fdmove -c 2 1
 exec -c
-s6-devd
-mdev
+s6-uevent-listener
diff --git a/examples/source/devd-log/type b/examples/source/mdevd-listener/type
index 5883cff..5883cff 100644
--- a/examples/source/devd-log/type
+++ b/examples/source/mdevd-listener/type
diff --git a/examples/source/mdevd/consumer-for b/examples/source/mdevd/consumer-for
new file mode 100644
index 0000000..c37e40d
--- /dev/null
+++ b/examples/source/mdevd/consumer-for
@@ -0,0 +1 @@
+mdevd-listener
diff --git a/examples/source/mdevd/dependencies b/examples/source/mdevd/dependencies
new file mode 100644
index 0000000..f23f767
--- /dev/null
+++ b/examples/source/mdevd/dependencies
@@ -0,0 +1 @@
+init-devtmpfs
diff --git a/examples/source/mdevd/run b/examples/source/mdevd/run
new file mode 100755
index 0000000..a8542c0
--- /dev/null
+++ b/examples/source/mdevd/run
@@ -0,0 +1,5 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+exec -c
+s6-uevent-spawner
+/bin/mdev
diff --git a/examples/source/devd/type b/examples/source/mdevd/type
index 5883cff..5883cff 100644
--- a/examples/source/devd/type
+++ b/examples/source/mdevd/type
diff --git a/examples/source/ok-local/contents b/examples/source/ok-local/contents
index 188d377..4e44ed6 100644
--- a/examples/source/ok-local/contents
+++ b/examples/source/ok-local/contents
@@ -1,4 +1,4 @@
-devd
+mdevd-pipeline
 syslogd
 klogd
 fdholder