Small incremental build fixes (40)

12 files changed, 21 insertions, 29 deletions

diff --git a/layout/rootfs/etc/s6-rc/source-base/00/up b/layout/rootfs/etc/s6-rc/source-base/00/up
index 5ca67e1..5ffa243 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 { s6-echo "init stage2 starting" }
-s6-hostname %%HOSTNAME%%
+if { echo "init stage2 starting" }
+hostname %%HOSTNAME%%
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 a2c371b..edd2c67 100755
--- a/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
+++ b/layout/rootfs/etc/s6-rc/source-base/fifodir-cleanup/run
@@ -2,9 +2,9 @@
 fdmove -c 2 1
 if
 {
-  forbacktickx -p -0 i { s6-ls -0 /run/service }
+  forbacktickx -p -d"\n" i { ls -1 /run/service }
   importas -u i
   s6-cleanfifodir /run/service/${i}/event
 }
 s6-setuidgid nobody
-s6-sleep 86400
+sleep 86400
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 75c622a..9f9edb5 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,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 }
+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
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 9e846f8..3f3330c 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
-s6-echo -- $VALUE
+echo -- $VALUE
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 8c5da6d..f352659 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/up
@@ -1,4 +1,2 @@
-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
+if { mkdir -p -m 0755 -- /dev/pts }
+mount -wt devpts -o noexec,nosuid,gid=0,mode=0600 devpts /dev/pts
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 1eeaa8a..249f8e9 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
@@ -1,3 +1 @@
-foreground { s6-mount -wt proc proc /proc }
-importas ? ?
-s6-test $? -le 1
+mount -wt proc proc /proc
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 00b6eb1..2205619 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 @@
-s6-umount /mnt/rwfs
+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 f5bee4c..f7984e2 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 @@
-s6-mount -wt ext4 /dev/vdb /mnt/rwfs
+mount -wt ext4 /dev/vdb /mnt/rwfs
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 9573fe4..bd46374 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
@@ -1,3 +1 @@
-foreground { s6-mount -wt sysfs sys /sys }
-importas ? ?
-s6-test $? -le 1
+mount -wt sysfs sys /sys
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 2f0e1e1..a321930 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-tmp/up
@@ -1,3 +1 @@
-foreground { s6-mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp }
-importas ? ?
-s6-test $? -le 1
+mount -wt tmpfs -o nodev,mode=1777 tmpfs /tmp
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 2583c7d..8eaa02c 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 @@
-s6-umount /mnt/userfs
+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 5ccc55e..b702681 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 @@
-s6-mount -wt ext4 /dev/vdc /mnt/userfs
+mount -wt ext4 /dev/vdc /mnt/userfs