From 151743918d1cb706052ddc642a5190e9cb8cd5dc Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 31 Oct 2017 09:12:02 +0000
Subject:  Update versions (save kernel) to current for 2017-10-31; replace
 mdev with mdevd

---
 layout/initramfs/init                                             | 2 +-
 layout/initramfs/sbin/.empty                                      | 0
 layout/rootfs/etc/s6-rc/source-base/devd/dependencies             | 1 -
 layout/rootfs/etc/s6-rc/source-base/devd/run                      | 5 -----
 layout/rootfs/etc/s6-rc/source-base/devd/type                     | 1 -
 layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies    | 2 +-
 layout/rootfs/etc/s6-rc/source-base/init-coldplug/up              | 2 +-
 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies    | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name   | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for    | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run             | 3 +++
 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type            | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for            | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies            | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd/run                     | 4 ++++
 layout/rootfs/etc/s6-rc/source-base/mdevd/type                    | 1 +
 layout/rootfs/etc/s6-rc/source-base/ok-local/contents             | 2 +-
 18 files changed, 19 insertions(+), 11 deletions(-)
 delete mode 100644 layout/initramfs/sbin/.empty
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/devd/dependencies
 delete mode 100755 layout/rootfs/etc/s6-rc/source-base/devd/run
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/devd/type
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for
 create mode 100755 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
 create mode 100755 layout/rootfs/etc/s6-rc/source-base/mdevd/run
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd/type

(limited to 'layout')

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
diff --git a/layout/rootfs/etc/s6-rc/source-base/devd/dependencies b/layout/rootfs/etc/s6-rc/source-base/devd/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/devd/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/devd/run b/layout/rootfs/etc/s6-rc/source-base/devd/run
deleted file mode 100755
index f9bda39..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/devd/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/command/execlineb -P
-fdmove -c 2 1
-exec -c
-s6-devd
-/bin/mdev
diff --git a/layout/rootfs/etc/s6-rc/source-base/devd/type b/layout/rootfs/etc/s6-rc/source-base/devd/type
deleted file mode 100644
index 5883cff..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/devd/type
+++ /dev/null
@@ -1 +0,0 @@
-longrun
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/mdevd-netlink/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
new file mode 100644
index 0000000..c1ee812
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
@@ -0,0 +1 @@
+init-dev
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/mdevd-netlink/run b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
new file mode 100755
index 0000000..aa30b24
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+exec -c
+mdevd-netlink -d 3
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
@@ -0,0 +1 @@
+longrun
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
-- 
cgit v1.3.1