From 0c1e784df7e69bf08a5569476e0a856f3f248fc5 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 30 Mar 2018 12:00:16 +0000
Subject:  Rip out initramfs, remove wireless-db hack for 4.15.12 kernel

---
 layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies | 1 +
 layout/rootfs/etc/s6-rc/source-base/init-coldplug/down         | 1 -
 layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies      | 1 +
 layout/rootfs/etc/s6-rc/source-base/init-dev/down              | 1 -
 layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies   | 2 +-
 layout/rootfs/etc/s6-rc/source-base/klogd/dependencies         | 2 +-
 layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies         | 1 +
 layout/rootfs/etc/s6-rc/source-base/mount-devpts/down          | 1 -
 layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies    | 1 +
 layout/rootfs/etc/s6-rc/source-base/mount-proc/type            | 1 +
 layout/rootfs/etc/s6-rc/source-base/mount-proc/up              | 3 +++
 layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies     | 1 +
 layout/rootfs/etc/s6-rc/source-base/mount-sys/type             | 1 +
 layout/rootfs/etc/s6-rc/source-base/mount-sys/up               | 3 +++
 layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents     | 2 ++
 15 files changed, 17 insertions(+), 5 deletions(-)
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/init-coldplug/down
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/init-dev/down
 delete mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-devpts/down
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-proc/type
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-proc/up
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-sys/type
 create mode 100644 layout/rootfs/etc/s6-rc/source-base/mount-sys/up

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

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 18fefaa..2820f48 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
@@ -1,2 +1,3 @@
+mount-sys
 init-dev
 mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/down b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/down
deleted file mode 100644
index 8b13789..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/down
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
index eec2035..fc811ee 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
@@ -1 +1,2 @@
 init-run
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/down b/layout/rootfs/etc/s6-rc/source-base/init-dev/down
deleted file mode 100644
index 8b13789..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/down
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
index 4daddb7..0df58a3 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
@@ -1 +1 @@
-00
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
index 4daddb7..0df58a3 100644
--- a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
@@ -1 +1 @@
-00
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
index c1ee812..690f6cf 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
@@ -1 +1,2 @@
+mount-sys
 init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/down b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/down
deleted file mode 100644
index f886363..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/down
+++ /dev/null
@@ -1 +0,0 @@
-s6-umount /dev/pts
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
new file mode 100644
index 0000000..4daddb7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
@@ -0,0 +1 @@
+00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/type b/layout/rootfs/etc/s6-rc/source-base/mount-proc/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
new file mode 100644
index 0000000..1eeaa8a
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
@@ -0,0 +1,3 @@
+foreground { s6-mount -wt proc proc /proc }
+importas ? ?
+s6-test $? -le 1
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
new file mode 100644
index 0000000..4daddb7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
@@ -0,0 +1 @@
+00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/type b/layout/rootfs/etc/s6-rc/source-base/mount-sys/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
new file mode 100644
index 0000000..9573fe4
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
@@ -0,0 +1,3 @@
+foreground { s6-mount -wt sysfs sys /sys }
+importas ? ?
+s6-test $? -le 1
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
index c78c4a4..4f9af9e 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
@@ -1,2 +1,4 @@
+mount-proc
+mount-sys
 mount-devpts
 mount-cgroups
-- 
cgit v1.2.3