diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-04-02 15:51:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-04-02 15:51:34 +0000 |
| commit | fdc650659fb7f43ffcb9fbca80998f1d50a190f9 (patch) | |
| tree | 8eb79afb62968e531ecef64e8eacb1b1049e8976 /vm/sys | |
| parent | a3de69aee8f5e8207fce29c9e72cdfd273a86404 (diff) | |
| download | spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.tar spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.tar.gz spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.tar.bz2 spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.tar.lz spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.tar.xz spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.tar.zst spectrum-fdc650659fb7f43ffcb9fbca80998f1d50a190f9.zip | |
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.
Diffstat (limited to 'vm/sys')
| -rw-r--r-- | vm/sys/net/default.nix | 5 | ||||
| -rwxr-xr-x | vm/sys/net/etc/init | 4 |
2 files changed, 4 insertions, 5 deletions
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 } |