Reimport userfs, rwfs and s6-rc from master

58 files changed, 110 insertions, 0 deletions

diff --git a/layout/rootfs/etc/s6-rc/source-base/00/down b/layout/rootfs/etc/s6-rc/source-base/00/down
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/00/down
@@ -0,0 +1 @@
+
diff --git a/layout/rootfs/etc/s6-rc/source-base/00/type b/layout/rootfs/etc/s6-rc/source-base/00/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/00/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/00/up b/layout/rootfs/etc/s6-rc/source-base/00/up
new file mode 100644
index 0000000..5ca67e1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/00/up
@@ -0,0 +1,2 @@
+if { s6-echo "init stage2 starting" }
+s6-hostname %%HOSTNAME%%
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents b/layout/rootfs/etc/s6-rc/source-base/default/contents
new file mode 100644
index 0000000..0882c2e
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/default/contents
@@ -0,0 +1,5 @@
+mdevd
+klogd-pipeline
+mount-disks
+mount-virtual
+fifodir-cleanup
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/type b/layout/rootfs/etc/s6-rc/source-base/default/type
new file mode 100644
index 0000000..757b422
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/default/type
@@ -0,0 +1 @@
+bundle
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies
new file mode 100644
index 0000000..4daddb7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies
@@ -0,0 +1 @@
+00
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
new file mode 100755
index 0000000..a2c371b
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
@@ -0,0 +1,10 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+if
+{
+  forbacktickx -p -0 i { s6-ls -0 /run/service }
+  importas -u i
+  s6-cleanfifodir /run/service/${i}/event
+}
+s6-setuidgid nobody
+s6-sleep 86400
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/type b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/type
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..18fefaa
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
@@ -0,0 +1,2 @@
+init-dev
+mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/type b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
new file mode 100644
index 0000000..edc5c1b
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/up
@@ -0,0 +1 @@
+mdevd-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
new file mode 100644
index 0000000..0df58a3
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
@@ -0,0 +1 @@
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/type b/layout/rootfs/etc/s6-rc/source-base/init-dev/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/up b/layout/rootfs/etc/s6-rc/source-base/init-dev/up
new file mode 100644
index 0000000..75c622a
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/up
@@ -0,0 +1,8 @@
+foreground { s6-ln -sf /proc/self/fd /dev }
+foreground { s6-ln -sf /proc/kcore /dev/core }
+foreground { s6-ln -sf loop0 /dev/loop }
+foreground { s6-ln -sf /run/shm /dev }
+foreground { s6-ln -sf fd/0 /dev/stdin }
+foreground { s6-ln -sf fd/1 /dev/stdout }
+foreground { s6-ln -sf fd/2 /dev/stderr }
+exit 0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies
new file mode 100644
index 0000000..f4c707c
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies
@@ -0,0 +1 @@
+init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/type b/layout/rootfs/etc/s6-rc/source-base/init-lo/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/up b/layout/rootfs/etc/s6-rc/source-base/init-lo/up
new file mode 100644
index 0000000..1a1beea
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/up
@@ -0,0 +1,2 @@
+if { ip addr add 127.0.0.1/8 dev lo }
+ip link set dev lo up
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
new file mode 100644
index 0000000..0df58a3
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
@@ -0,0 +1 @@
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/type b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up
new file mode 100644
index 0000000..9e846f8
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up
@@ -0,0 +1,6 @@
+redirfd -r 0 /etc/sysctl.conf
+forstdin -nCd"\n" -- LINE
+importas -u LINE LINE
+multidefine -C $LINE { CTL VALUE }
+redirfd -w 1 /proc/sys/$CTL
+s6-echo -- $VALUE
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/consumer-for b/layout/rootfs/etc/s6-rc/source-base/klogd-log/consumer-for
new file mode 100644
index 0000000..fd64770
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/consumer-for
@@ -0,0 +1 @@
+klogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies
new file mode 100644
index 0000000..7c63988
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies
@@ -0,0 +1 @@
+mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/pipeline-name b/layout/rootfs/etc/s6-rc/source-base/klogd-log/pipeline-name
new file mode 100644
index 0000000..cb7ca7b
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/pipeline-name
@@ -0,0 +1 @@
+klogd-pipeline
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/run b/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
new file mode 100755
index 0000000..90e474b
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
@@ -0,0 +1,4 @@
+#!/command/execlineb -P
+s6-setuidgid kllog
+exec -c
+s6-log t s1000000 n20 /var/log/klogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/type b/layout/rootfs/etc/s6-rc/source-base/klogd-log/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/type
@@ -0,0 +1 @@
+longrun
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
new file mode 100644
index 0000000..0df58a3
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
@@ -0,0 +1 @@
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/producer-for b/layout/rootfs/etc/s6-rc/source-base/klogd/producer-for
new file mode 100644
index 0000000..2f21a8f
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/producer-for
@@ -0,0 +1 @@
+klogd-log
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/run b/layout/rootfs/etc/s6-rc/source-base/klogd/run
new file mode 100755
index 0000000..95dc7e8
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/run
@@ -0,0 +1,6 @@
+#!/command/execlineb -P
+fdmove -c 2 1
+redirfd -r 0 /proc/kmsg
+# s6-setuidgid klog
+exec -c
+ucspilogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/type b/layout/rootfs/etc/s6-rc/source-base/klogd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/type
@@ -0,0 +1 @@
+longrun
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..690f6cf
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
@@ -0,0 +1,2 @@
+mount-sys
+init-dev
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
new file mode 100755
index 0000000..1d4e4e3
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
@@ -0,0 +1,3 @@
+#!/command/execlineb -P
+exec -c
+mdevd -D 3 -b 200000
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/mount-devpts/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies
new file mode 100644
index 0000000..c1ee812
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies
@@ -0,0 +1 @@
+init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/type b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
new file mode 100644
index 0000000..8c5da6d
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
@@ -0,0 +1,4 @@
+if { s6-mkdir -p -m 0755 -- /dev/pts }
+foreground { s6-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts }
+importas ? ?
+s6-test $? -le 1
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents
new file mode 100644
index 0000000..9c13766
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents
@@ -0,0 +1,2 @@
+mount-rwfs
+mount-userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/type b/layout/rootfs/etc/s6-rc/source-base/mount-disks/type
new file mode 100644
index 0000000..757b422
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-disks/type
@@ -0,0 +1 @@
+bundle
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-rwfs/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies
new file mode 100644
index 0000000..bee63cb
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies
@@ -0,0 +1 @@
+init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down
new file mode 100644
index 0000000..00b6eb1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down
@@ -0,0 +1 @@
+s6-umount /mnt/rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/type b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up
new file mode 100644
index 0000000..f5bee4c
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up
@@ -0,0 +1 @@
+s6-mount -wt ext4 /dev/vdb /mnt/rwfs
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-tmp/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies
new file mode 100644
index 0000000..4daddb7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies
@@ -0,0 +1 @@
+00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/down b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/down
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/down
@@ -0,0 +1 @@
+
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/type b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
new file mode 100644
index 0000000..2f0e1e1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
@@ -0,0 +1,3 @@
+foreground { s6-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp }
+importas ? ?
+s6-test $? -le 1
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies
new file mode 100644
index 0000000..bee63cb
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies
@@ -0,0 +1 @@
+init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down
new file mode 100644
index 0000000..2583c7d
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down
@@ -0,0 +1 @@
+s6-umount /mnt/userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/type b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up
new file mode 100644
index 0000000..5ccc55e
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up
@@ -0,0 +1 @@
+s6-mount -wt ext4 /dev/vdc /mnt/userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
new file mode 100644
index 0000000..c9d2af7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
@@ -0,0 +1,4 @@
+mount-proc
+mount-sys
+mount-devpts
+mount-tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/type b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/type
new file mode 100644
index 0000000..757b422
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/type
@@ -0,0 +1 @@
+bundle