vm: remove s6-mount everywhere

Problems with s6-mount:

 • s6-mount -a will fail if some filesystems have already been mounted
 • Does not support LABEL= device patterns.

We also already have a mount implementation in Busybox, so
standardising on that lets us drop the s6-linux-utils package entirely.

6 files changed, 12 insertions, 15 deletions

diff --git a/vm/app/catgirl/default.nix b/vm/app/catgirl/default.nix
index 716e7dd..230da00 100644
--- a/vm/app/catgirl/default.nix
+++ b/vm/app/catgirl/default.nix
@@ -9,15 +9,14 @@ pkgs.pkgsStatic.callPackage (
 
 { lib, stdenv, runCommand, writeReferencesToFile, buildPackages
 , s6-rc, tar2ext4
-, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-linux-utils
-, s6-portable-utils
+, busybox, cacert, catgirl, execline, kmod, mdevd, s6, s6-portable-utils
 }:
 
 let
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep;
 
   packages = [
-    catgirl execline kmod mdevd s6 s6-linux-utils s6-portable-utils s6-rc
+    catgirl execline kmod mdevd s6 s6-portable-utils s6-rc
 
     (busybox.override {
       extraConfig = ''
diff --git a/vm/app/catgirl/etc/init b/vm/app/catgirl/etc/init
index e144760..4f3ed66 100755
--- a/vm/app/catgirl/etc/init
+++ b/vm/app/catgirl/etc/init
@@ -6,7 +6,7 @@
 /bin/s6-setsid -qb --
 
 umask 022
-if { s6-mount -t tmpfs -o mode=0755 tmpfs /run }
+if { mount -t tmpfs -o mode=0755 tmpfs /run }
 if { s6-hiercopy /etc/service /run/service }
 emptyenv -p
 
@@ -17,7 +17,7 @@ background {
 
   if { s6-mkdir -p /dev/pts /dev/shm }
 
-  if { s6-mount -a }
+  if { mount -a }
 
   s6-rc change ok-all
 }
diff --git a/vm/app/lynx/default.nix b/vm/app/lynx/default.nix
index 72bff7f..f7791d8 100644
--- a/vm/app/lynx/default.nix
+++ b/vm/app/lynx/default.nix
@@ -9,15 +9,14 @@ pkgs.pkgsStatic.callPackage (
 
 { lib, stdenv, runCommand, writeReferencesToFile, buildPackages
 , s6-rc, tar2ext4
-, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-linux-utils
-, s6-portable-utils
+, busybox, cacert, execline, kmod, lynx, mdevd, s6, s6-portable-utils
 }:
 
 let
   inherit (lib) cleanSource cleanSourceWith concatMapStringsSep;
 
   packages = [
-    execline kmod lynx mdevd s6 s6-linux-utils s6-portable-utils s6-rc
+    execline kmod lynx mdevd s6 s6-portable-utils s6-rc
 
     (busybox.override {
       extraConfig = ''
diff --git a/vm/app/lynx/etc/init b/vm/app/lynx/etc/init
index e144760..4f3ed66 100755
--- a/vm/app/lynx/etc/init
+++ b/vm/app/lynx/etc/init
@@ -6,7 +6,7 @@
 /bin/s6-setsid -qb --
 
 umask 022
-if { s6-mount -t tmpfs -o mode=0755 tmpfs /run }
+if { mount -t tmpfs -o mode=0755 tmpfs /run }
 if { s6-hiercopy /etc/service /run/service }
 emptyenv -p
 
@@ -17,7 +17,7 @@ background {
 
   if { s6-mkdir -p /dev/pts /dev/shm }
 
-  if { s6-mount -a }
+  if { mount -a }
 
   s6-rc change ok-all
 }
diff --git a/vm/sys/net/default.nix b/vm/sys/net/default.nix
index 62a13bb..e3bd996 100644
--- a/vm/sys/net/default.nix
+++ b/vm/sys/net/default.nix
@@ -10,7 +10,7 @@ pkgs.pkgsStatic.callPackage (
 { lib, stdenv, runCommand, writeReferencesToFile, buildPackages
 , s6-rc, tar2ext4, xorg
 , busybox, connmanMinimal, dbus, execline, kmod, mdevd, nftables, s6
-, s6-linux-utils, s6-portable-utils
+, s6-portable-utils
 }:
 
 let
@@ -19,8 +19,7 @@ let
   connman = connmanMinimal;
 
   packages = [
-    connman dbus execline kmod mdevd s6 s6-linux-utils
-    s6-portable-utils s6-rc
+    connman dbus execline kmod mdevd s6 s6-portable-utils s6-rc
 
     (busybox.override {
       extraConfig = ''
diff --git a/vm/sys/net/etc/init b/vm/sys/net/etc/init
index e144760..4f3ed66 100755
--- a/vm/sys/net/etc/init
+++ b/vm/sys/net/etc/init
@@ -6,7 +6,7 @@
 /bin/s6-setsid -qb --
 
 umask 022
-if { s6-mount -t tmpfs -o mode=0755 tmpfs /run }
+if { mount -t tmpfs -o mode=0755 tmpfs /run }
 if { s6-hiercopy /etc/service /run/service }
 emptyenv -p
 
@@ -17,7 +17,7 @@ background {
 
   if { s6-mkdir -p /dev/pts /dev/shm }
 
-  if { s6-mount -a }
+  if { mount -a }
 
   s6-rc change ok-all
 }