Update to latest versions (yet untested)

Signed-off-by: Laurent Bercot <ska@appnovation.com>

109 files changed, 59 insertions, 81 deletions

diff --git a/layout/rootfs/etc/s6-rc/source-base/00/up b/layout/rootfs/etc/s6-rc/source-base/00/up
index 5ffa243..5ca67e1 100644
--- a/layout/rootfs/etc/s6-rc/source-base/00/up
+++ b/layout/rootfs/etc/s6-rc/source-base/00/up
@@ -1,2 +1,2 @@
-if { echo "init stage2 starting" }
-hostname %%HOSTNAME%%
+if { s6-echo "init stage2 starting" }
+s6-hostname %%HOSTNAME%%
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/run b/layout/rootfs/etc/s6-rc/source-base/btmpd/run
new file mode 100755
index 0000000..4c7ffe6
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/run
@@ -0,0 +1,8 @@
+#!/package/admin/execline/command/execlineb -S1
+
+fdmove -c 2 1
+s6-setuidgid utmp
+cd /var/log/wtmpd
+fdmove 1 3
+s6-ipcserver -1 -c 1000 -- /run/utmps/.btmpd-socket
+utmps-wtmpd btmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/btmpd/type b/layout/rootfs/etc/s6-rc/source-base/btmpd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/btmpd/type
@@ -0,0 +1 @@
+longrun
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents b/layout/rootfs/etc/s6-rc/source-base/default/contents
deleted file mode 100644
index 359e9bc..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/default/contents
+++ /dev/null
@@ -1,2 +0,0 @@
-ok-local
-ok-lan
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-lan
diff --git a/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/default/contents.d/ok-local
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/dependencies.d/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
index 71f2243..0d2b850 100755
--- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
@@ -1,10 +1,10 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 fdmove -c 2 1
 if
 {
-  forbacktickx -p -d"\n" i { ls -1 /run/service }
+  forbacktickx -p -d"\n" i { s6-ls /run/service }
   importas -u i i
   s6-cleanfifodir /run/service/${i}/event
 }
 s6-setuidgid nobody
-sleep 86400
+s6-sleep 86400
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
deleted file mode 100644
index 18fefaa..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-dev
-mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/mdevd b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/mdevd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies.d/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 edc5c1b..df8e960 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 @@
-mdevd-coldplug
+mdevd-coldplug -O4
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
deleted file mode 100644
index 0df58a3..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies.d/mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/up b/layout/rootfs/etc/s6-rc/source-base/init-dev/up
index 9f9edb5..602cf0b 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/up
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/up
@@ -1,8 +1,7 @@
-foreground { ln -sf /proc/self/fd /dev }
-foreground { ln -sf /proc/kcore /dev/core }
-foreground { ln -sf loop0 /dev/loop }
-foreground { ln -sf /run/shm /dev }
-foreground { ln -sf fd/0 /dev/stdin }
-foreground { ln -sf fd/1 /dev/stdout }
-foreground { ln -sf fd/2 /dev/stderr }
-exit 0
+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 }
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies
deleted file mode 100644
index 97749cc..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-sysctl
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/dependencies.d/init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-eth0/down b/layout/rootfs/etc/s6-rc/source-base/init-eth0/down
index 6733be4..547ab86 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-eth0/down
+++ b/layout/rootfs/etc/s6-rc/source-base/init-eth0/down
@@ -1,3 +1,2 @@
 foreground { ip link set dev eth0 down }
 foreground { bcnm-waitif -d 2 eth0 }
-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
deleted file mode 100644
index 97749cc..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-sysctl
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/dependencies.d/init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-lo/down b/layout/rootfs/etc/s6-rc/source-base/init-lo/down
index 5a85d32..861cdd2 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-lo/down
+++ b/layout/rootfs/etc/s6-rc/source-base/init-lo/down
@@ -1,3 +1,2 @@
 foreground { ip link set dev lo down }
 foreground { bcnm-waitif -d 2 lo }
-exit 0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies
deleted file mode 100644
index 61c05ca..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth0 b/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-route/dependencies.d/init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-route/down b/layout/rootfs/etc/s6-rc/source-base/init-route/down
index a498b23..4a9bd4e 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-route/down
+++ b/layout/rootfs/etc/s6-rc/source-base/init-route/down
@@ -1,2 +1 @@
 foreground { ip route del default }
-exit 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
deleted file mode 100644
index 0df58a3..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies.d/mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up
index 7f1874b..7a93ed2 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/up
@@ -3,4 +3,4 @@ forstdin -nCd"\n" -- LINE
 importas -u LINE LINE
 multidefine -C $LINE { CTL VALUE }
 redirfd -w 1 /proc/sys/$CTL
-echo $VALUE
+s6-echo $VALUE
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/btmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/dependencies.d/wtmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/down b/layout/rootfs/etc/s6-rc/source-base/init-utmp/down
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/down
@@ -0,0 +1 @@
+
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/type b/layout/rootfs/etc/s6-rc/source-base/init-utmp/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-utmp/up b/layout/rootfs/etc/s6-rc/source-base/init-utmp/up
new file mode 100644
index 0000000..6d61a8b
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/init-utmp/up
@@ -0,0 +1,3 @@
+backtick -E kversion { uname -r }
+if { utmps-write -t 2000 -uw -l reboot -p 0 -h ${kversion} -- "~~" BOOT_TIME "~" }
+     utmps-write -t 2000 -uw -l runlevel -p 20018 -h ${kversion} -- "~~" RUN_LVL "~"
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies
deleted file mode 100644
index 7c63988..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd-log/run b/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
index 90e474b..cad8883 100755
--- a/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd-log/run
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 s6-setuidgid kllog
 exec -c
 s6-log t s1000000 n20 /var/log/klogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
deleted file mode 100644
index 0df58a3..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies.d/mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/run b/layout/rootfs/etc/s6-rc/source-base/klogd/run
index 95dc7e8..c6df5ee 100755
--- a/layout/rootfs/etc/s6-rc/source-base/klogd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/run
@@ -1,6 +1,5 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 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/mdevd/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
deleted file mode 100644
index 690f6cf..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-mount-sys
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies.d/mount-sys
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/run b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
index 1d4e4e3..32dcd46 100755
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/run
@@ -1,3 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
+
 exec -c
-mdevd -D 3 -b 200000
+mdevd -D3 -O4
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
index f352659..3d5707d 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
@@ -1,2 +1,2 @@
-if { mkdir -p -m 0755 -- /dev/pts }
-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts
+if { s6-mkdir -p -m 0755 -- /dev/pts }
+s6-mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents
deleted file mode 100644
index 9c13766..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents
+++ /dev/null
@@ -1,2 +0,0 @@
-mount-rwfs
-mount-userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-disks/contents.d/mount-userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies.d/00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
index 249f8e9..f198029 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
@@ -1 +1 @@
-mount -wt proc proc /proc
+s6-mount -wt proc proc /proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies
deleted file mode 100644
index bee63cb..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/dependencies.d/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
index 2205619..00b6eb1 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/down
@@ -1 +1 @@
-umount /mnt/rwfs
+s6-umount /mnt/rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up
index f7984e2..f5bee4c 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-rwfs/up
@@ -1 +1 @@
-mount -wt ext4 /dev/vdb /mnt/rwfs
+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
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies.d/00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
index bd46374..780be7b 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
@@ -1 +1 @@
-mount -wt sysfs sys /sys
+s6-mount -wt sysfs sys /sys
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies
deleted file mode 100644
index 4daddb7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/00 b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/00
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/dependencies.d/00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
index a321930..9eaeab4 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
@@ -1 +1 @@
-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp
+s6-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies
deleted file mode 100644
index bee63cb..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-coldplug
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/init-coldplug b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/init-coldplug
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/dependencies.d/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
index 8eaa02c..2583c7d 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/down
@@ -1 +1 @@
-umount /mnt/userfs
+s6-umount /mnt/userfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up
index b702681..5ccc55e 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-userfs/up
@@ -1 +1 @@
-mount -wt ext4 /dev/vdc /mnt/userfs
+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
deleted file mode 100644
index c9d2af7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
+++ /dev/null
@@ -1,4 +0,0 @@
-mount-proc
-mount-sys
-mount-devpts
-mount-tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-devpts
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-sys
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents.d/mount-tmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents
deleted file mode 100644
index 11e9fd9..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents
+++ /dev/null
@@ -1,4 +0,0 @@
-init-lo
-init-eth0
-init-route
-sshd-4
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth0 b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-lo
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/init-route
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-4 b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-lan/contents.d/sshd-4
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
deleted file mode 100644
index 2d907c7..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents
+++ /dev/null
@@ -1,6 +0,0 @@
-mdevd
-syslogd-pipeline
-klogd-pipeline
-mount-disks
-mount-virtual
-fifodir-cleanup
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/btmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/fifodir-cleanup
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/init-utmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/klogd-pipeline
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-disks
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/mount-virtual
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/syslogd-pipeline
diff --git a/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/ok-local/contents.d/wtmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies
deleted file mode 100644
index 7c63988..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run
index e40c2af..8e5d30a 100755
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4-log/run
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 s6-setuidgid sshlog
 exec -c
 s6-log t s1000000 n20 /var/log/sshd-4
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies
deleted file mode 100644
index 8aee9b6..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies
+++ /dev/null
@@ -1,2 +0,0 @@
-init-sysctl
-init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth0 b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth0
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-eth0
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-sysctl
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/dependencies.d/init-utmp
diff --git a/layout/rootfs/etc/s6-rc/source-base/sshd-4/run b/layout/rootfs/etc/s6-rc/source-base/sshd-4/run
index 9af7f3d..1b5f9a0 100755
--- a/layout/rootfs/etc/s6-rc/source-base/sshd-4/run
+++ b/layout/rootfs/etc/s6-rc/source-base/sshd-4/run
@@ -1,6 +1,6 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 fdmove -c 2 1
 fdmove 1 3
 s6-tcpserver4 -v 2 -1 -- 10.0.2.1 22
-s6-tcpserver-access -v 2 -DRHl0 -t 5000 -i data/rules --
+s6-tcpserver-access -v 2 -RHl0 -t 5000 -i data/rules --
 dropbear -i -K 60
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies
deleted file mode 100644
index 7c63988..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run
index b04f309..5c6cf65 100755
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd-log/run
@@ -1,4 +1,4 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 s6-setuidgid sysllog
 exec -c
 s6-log t s1000000 n20 /var/log/syslogd
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies
deleted file mode 100644
index c1ee812..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies
+++ /dev/null
@@ -1 +0,0 @@
-init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev b/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd/dependencies.d/init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/syslogd/run b/layout/rootfs/etc/s6-rc/source-base/syslogd/run
index 2462989..7ac1f47 100755
--- a/layout/rootfs/etc/s6-rc/source-base/syslogd/run
+++ b/layout/rootfs/etc/s6-rc/source-base/syslogd/run
@@ -1,5 +1,5 @@
-#!/command/execlineb -P
+#!/command/execlineb -S1
 s6-envuidgid syslog
 fdclose 0
 exec -c
-socklog
+s6-socklog -d3
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs b/layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/dependencies.d/mount-rwfs
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd b/layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd
new file mode 100644
index 0000000..00750ed
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/run b/layout/rootfs/etc/s6-rc/source-base/wtmpd/run
new file mode 100755
index 0000000..a49e0de
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/run
@@ -0,0 +1,7 @@
+#!/command/execlineb -S1
+fdmove -c 2 1
+s6-setuidgid utmp
+cd /var/log/wtmpd
+fdmove 1 3
+s6-ipcserver -1 -c 1000 -- /run/utmps/.wtmpd-socket
+utmps-wtmpd
diff --git a/layout/rootfs/etc/s6-rc/source-base/wtmpd/type b/layout/rootfs/etc/s6-rc/source-base/wtmpd/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/wtmpd/type
@@ -0,0 +1 @@
+longrun