[PATCH 11/22] host/rootfs: move ext mounting to s6-rc service

Alyssa Ross
2022-10-10T23:32:38Z

Broadly, it makes sense to do things in s6-rc rather than mdev
commands where possible, since mdev commands are not run in parallel.
That's unlikely to make a big difference in this case, but we might
want to do more things before mounting as well (e.g. growing the
filesystem) and I think it makes sense to do that here.

Signed-off-by: Alyssa Ross <hi@alyssa.is>
---
host/rootfs/etc/mdev/block/add | 1 -
host/rootfs/etc/s6-rc/ext/up | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/host/rootfs/etc/mdev/block/add b/host/rootfs/etc/mdev/block/add
index 75e0c31..3e24355 100755
--- a/host/rootfs/etc/mdev/block/add
+++ b/host/rootfs/etc/mdev/block/add
@@ -35,5 +35,4 @@ if {
}

if { ln -s $devname ext }
-if { mount ext /ext }
/etc/mdev/listen ext
diff --git a/host/rootfs/etc/s6-rc/ext/up b/host/rootfs/etc/s6-rc/ext/up
index d9e0426..4e0b9fc 100644
--- a/host/rootfs/etc/s6-rc/ext/up
+++ b/host/rootfs/etc/s6-rc/ext/up
@@ -1,4 +1,5 @@
# SPDX-License-Identifier: EUPL-1.2+
# SPDX-FileCopyrightText: 2021-2022 Alyssa Ross <hi@alyssa.is>

-/etc/mdev/wait ext
+if { /etc/mdev/wait ext }
+mount /dev/ext /ext
--
2.37.1