summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-10-10 23:28:51 +0000
committerAlyssa Ross <hi@alyssa.is>2022-11-13 23:59:00 +0000
commitdb9b640857bef3a835d9dc4a1bfc62e260f3a7b4 (patch)
treec491211fdc93a22b1836682582fdab8099d7627e
parent2b0083087c127c5abbc8d694719fd6b94c2a9995 (diff)
downloadspectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.tar
spectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.tar.gz
spectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.tar.bz2
spectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.tar.lz
spectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.tar.xz
spectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.tar.zst
spectrum-db9b640857bef3a835d9dc4a1bfc62e260f3a7b4.zip
host/rootfs: move ext mounting to s6-rc service
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>
Message-Id: <20221010232909.1953738-12-hi@alyssa.is>
-rwxr-xr-xhost/rootfs/etc/mdev/block/add1
-rw-r--r--host/rootfs/etc/s6-rc/ext/up3
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