From 42672f7dae736df9b800d95f5b4c2826fa85b68e Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 16 Jan 2018 02:28:19 +0000
Subject:  Update for kernel-4.14.13 and mdevd-0.1.0.0

---
 layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies    | 1 +
 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/notification-fd         | 1 +
 layout/rootfs/etc/s6-rc/source-base/mdevd/run                     | 2 +-
 layout/rootfs/etc/s6-rc/source-base/ok-local/contents             | 2 +-
 12 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for
 delete mode 100755 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mdevd/notification-fd

(limited to 'layout/rootfs/etc/s6-rc/source-base')

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 c1ee812..18fefaa 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,2 @@
 init-dev
+mdevd
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 8d668da..edc5c1b 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 @@
-pipeline { mdevd-coldplug } mdevd
+mdevd-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 00750ed..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/notification-fd
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 0d284a9..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/pipeline-name
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3252ded..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/producer-for
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100755
index aa30b24..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/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
deleted file mode 100644
index 5883cff..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd-netlink/type
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index ca025df..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/consumer-for
+++ /dev/null
@@ -1 +0,0 @@
-mdevd-netlink
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/mdevd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/run b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
index 52b5fdc..7144bc9 100755
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
@@ -1,4 +1,4 @@
 #!/command/execlineb -P
 exec -c
 export PATH /command:/bin
-mdevd
+mdevd -D 3
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 242cfed..cbe3499 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 @@
-mdevd-pipeline
+mdevd
 syslogd-pipeline
 klogd-pipeline
 fdholder-pipeline
-- 
cgit v1.3.1