Rip out initramfs, remove wireless-db hack for 4.15.12 kernel

23 files changed, 17 insertions, 54 deletions

diff --git a/layout/initramfs/bin/.empty b/layout/initramfs/bin/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/bin/.empty
+++ /dev/null
diff --git a/layout/initramfs/command/.empty b/layout/initramfs/command/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/command/.empty
+++ /dev/null
diff --git a/layout/initramfs/dev/.empty b/layout/initramfs/dev/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/dev/.empty
+++ /dev/null
diff --git a/layout/initramfs/etc/.empty b/layout/initramfs/etc/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/etc/.empty
+++ /dev/null
diff --git a/layout/initramfs/init b/layout/initramfs/init
deleted file mode 100755
index e34ff9f..0000000
--- a/layout/initramfs/init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/command/execlineb -S0
-
-# This initramfs is a stub. It just performs coldplug.
-# Since our rootfs shouldn't require a coldplug to be found,
-# we could do away with the initramfs, but we leave it as an example.
-
-/command/export PATH /command:/bin
-/command/cd /
-if { s6-echo "\n  initramfs (minimal)\n" }
-
-if { s6-mount -wt sysfs sys /sys }
-if { s6-mount -wt proc proc /proc }
-if { s6-mount -wt devtmpfs dev /dev }
-
-
-piperw 4 5
-background
-{
-  fdclose 4
-  mdevd -D 5
-}
-importas -u MDEVDPID !
-fdclose 5
-if -n { fdmove 0 4 forstdin -x 1 -- i exit 1 }  # readiness notif.
-fdclose 4
-if { mdevd-coldplug }
-if { kill $MDEVDPID }
-
-if { s6-mount -rt ext4 /dev/%%PARTITION%%1 /rootfs }
-
-if { s6-mount -o move /sys /rootfs/sys }
-if { s6-mount -o move /proc /rootfs/proc }
-if { s6-mount -o move /dev /rootfs/dev }
-
-cd /rootfs
-./command/s6-envdir -I /etc/env
-./command/if
-{
-  ./command/pipeline { ./command/s6-ls -a -x rootfs / }
-  ./command/forstdin -p -d"\n" i
-  ./command/importas -u i i
-  ./command/s6-rmrf /${i}
-}
-./command/if { ./command/s6-mount -o move . / }
-./command/s6-chroot .
-
-./command/tryexec { /sbin/init $@ }
-./command/tryexec { /bin/init $@ }
-/etc/init $@
diff --git a/layout/initramfs/proc/.empty b/layout/initramfs/proc/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/proc/.empty
+++ /dev/null
diff --git a/layout/initramfs/rootfs/.empty b/layout/initramfs/rootfs/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/rootfs/.empty
+++ /dev/null
diff --git a/layout/initramfs/sys/.empty b/layout/initramfs/sys/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/sys/.empty
+++ /dev/null
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