Fix some service definitions based on a running system

world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty1/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty1/conf
 importas -iu SPAWN SPAWN
-exec getty tty1
+exec getty /dev/tty1

world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty2/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty2/conf
 importas -iu SPAWN SPAWN
-exec getty tty2
+exec getty /dev/tty2

world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty3/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty3/conf
 importas -iu SPAWN SPAWN
-exec getty tty3
+exec getty /dev/tty3

world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty4/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty4/conf
 importas -iu SPAWN SPAWN
-exec getty tty4
+exec getty /dev/tty4

world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty5/run

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty5/conf
+envfile /etc/s6/sv/getty-tty5/conf
 importas -iu SPAWN SPAWN
-exec getty tty5
+exec getty /dev/tty5

world/s6-scripts/etc/s6/rc/compiled/servicedirs/getty-tty6/run

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty6/conf
+envfile /etc/s6/sv/getty-tty6/conf
 importas -iu SPAWN SPAWN
-exec getty tty6
+exec getty /dev/tty6

world/s6-scripts/etc/s6/sv/getty-tty1/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty1/conf
 importas -iu SPAWN SPAWN
-exec getty tty1
+exec getty /dev/tty1

world/s6-scripts/etc/s6/sv/getty-tty2/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty2/conf
 importas -iu SPAWN SPAWN
-exec getty tty2
+exec getty /dev/tty2

world/s6-scripts/etc/s6/sv/getty-tty3/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty3/conf
 importas -iu SPAWN SPAWN
-exec getty tty3
+exec getty /dev/tty3

world/s6-scripts/etc/s6/sv/getty-tty4/run

@@ -2,4 +2,4 @@
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
 envfile /etc/s6/sv/getty-tty4/conf
 importas -iu SPAWN SPAWN
-exec getty tty4
+exec getty /dev/tty4

world/s6-scripts/etc/s6/sv/getty-tty5/run

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty5/conf
+envfile /etc/s6/sv/getty-tty5/conf
 importas -iu SPAWN SPAWN
-exec getty tty5
+exec getty /dev/tty5

world/s6-scripts/etc/s6/sv/getty-tty6/run

@@ -1,5 +1,5 @@
 #!/bin/execlineb -P
 if { pipeline { redirfd -w 2 /dev/null s6-rc -a list } grep -qFx mount-filesystems }
-envfile /etc/s6/sv/agetty-tty6/conf
+envfile /etc/s6/sv/getty-tty6/conf
 importas -iu SPAWN SPAWN
-exec getty tty6
+exec getty /dev/tty6

world/s6-scripts/etc/s6/sv/misc/contents

@@ -1,6 +1,5 @@
 hostname
 hwclock
-modules
 kmod-static-nodes
 tmpfiles-dev
 rc-local

world/s6-scripts/etc/s6/sv/mount-filesystems/up

@@ -1,3 +1,3 @@
 #!/bin/execlineb -P
-foreground { mount -a -t nonfs,nocifs }
+foreground { mount -a -o no_netdev }
 foreground { if { test -x /usr/bin/zfs } zfs mount -a }

world/s6-scripts/etc/s6/sv/mount-net/up

@@ -1,2 +1,2 @@
 #!/bin/execlineb -P
-exec mount -a -t nfs,cifs
+exec mount -a -o netdev

world/s6-scripts/etc/s6/sv/setup/contents

@@ -4,7 +4,6 @@ getty
 net-lo
 swap
 random-seed
-tmpfiles-setup
 dmesg
 sysctl
 binfmt

world/s6-scripts/etc/s6/sv/sysuser/timeout-down

@@ -1 +0,0 @@
-0