commit 03e35051b2d1056444a8ca08efb14d09c0190182
parent f92a7dfbc311cc9d8a17306d023dfaabd02de8f3
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date: Mon, 25 Jul 2022 10:44:12 +0200
Use distribution mount command.
Diffstat:
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/fs b/fs
@@ -1,5 +1,5 @@
/
- source=LABEL="INSTALL_ROOT"
+ source=LABEL="SPARK_ROOT"
type=xfs
options=rw,noatime
premounted=true
diff --git a/s6-rc-mount.aat b/s6-rc-mount.aat
@@ -9,7 +9,7 @@ m644
|if(down_umount()) {
/{{svc_name}}/down cN s6-umount {{q_file}} m644
|} else if (down_readonly()) {
-/{{svc_name}}/down cN s6-mount -o remount,ro {{q_file}} m644
+/{{svc_name}}/down cN mount -o remount,ro {{q_file}} m644
|}
/{{svc_name}}/type cN oneshot m644
/{{svc_name}}/up
@@ -17,7 +17,7 @@ CN # mount {{get("source")}} on {{mtp}}
|if(boolean("mkdir")) {
if { mkdir -p {{q_file}} }
|}
- if -n -t { s6-mount -t {{q_vfstype}} -o {{q_remount_options}} {{q_spec}} {{q_file}} }
+ if -n -t { mount -t {{q_vfstype}} -o {{q_remount_options}} {{q_spec}} {{q_file}} }
s6-mount -t {{q_vfstype}} -o {{q_options}} {{q_spec}} {{q_file}}
|}
|### write_bundle ###
diff --git a/s6-rc-mount.awk b/s6-rc-mount.awk
@@ -9,7 +9,7 @@ printf "%s", "m644\n"
if(down_umount()) {
printf "%s", "/" (svc_name) "/down cN s6-umount " (q_file) " m644\n"
} else if (down_readonly()) {
-printf "%s", "/" (svc_name) "/down cN s6-mount -o remount,ro " (q_file) " m644\n"
+printf "%s", "/" (svc_name) "/down cN mount -o remount,ro " (q_file) " m644\n"
}
printf "%s", "/" (svc_name) "/type cN oneshot m644\n"
printf "%s", "/" (svc_name) "/up\n"
@@ -17,7 +17,7 @@ printf "%s", "CN # mount " (get("source")) " on " (mtp) "\n"
if(boolean("mkdir")) {
printf "%s", " if { mkdir -p " (q_file) " }\n"
}
-printf "%s", " if -n -t { s6-mount -t " (q_vfstype) " -o " (q_remount_options) " " (q_spec) " " (q_file) " }\n"
+printf "%s", " if -n -t { mount -t " (q_vfstype) " -o " (q_remount_options) " " (q_spec) " " (q_file) " }\n"
printf "%s", " s6-mount -t " (q_vfstype) " -o " (q_options) " " (q_spec) " " (q_file) "\n"
}
### write_bundle ###
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -1,10 +1,10 @@
/rootfs d m755
-/rootfs/down cN s6-mount -o remount,ro "/" m644
+/rootfs/down cN mount -o remount,ro "/" m644
/rootfs/type cN oneshot m644
/rootfs/up
-CN # mount LABEL="INSTALL_ROOT" on /
- if -n -t { s6-mount -t "xfs" -o "remount,rw,noatime" "LABEL=\"INSTALL_ROOT\"" "/" }
- s6-mount -t "xfs" -o "rw,noatime" "LABEL=\"INSTALL_ROOT\"" "/"
+CN # mount LABEL="SPARK_ROOT" on /
+ if -n -t { mount -t "xfs" -o "remount,rw,noatime" "LABEL=\"SPARK_ROOT\"" "/" }
+ s6-mount -t "xfs" -o "rw,noatime" "LABEL=\"SPARK_ROOT\"" "/"
/mount-sys d m755
/mount-sys/dependencies
CN rootfs
@@ -14,7 +14,7 @@ m644
/mount-sys/up
CN # mount sysfs on /sys
if { mkdir -p "/sys" }
- if -n -t { s6-mount -t "sysfs" -o "remount,rw" "sysfs" "/sys" }
+ if -n -t { mount -t "sysfs" -o "remount,rw" "sysfs" "/sys" }
s6-mount -t "sysfs" -o "rw" "sysfs" "/sys"
/mount-proc d m755
/mount-proc/dependencies
@@ -25,7 +25,7 @@ m644
/mount-proc/up
CN # mount proc on /proc
if { mkdir -p "/proc" }
- if -n -t { s6-mount -t "proc" -o "remount,rw" "proc" "/proc" }
+ if -n -t { mount -t "proc" -o "remount,rw" "proc" "/proc" }
s6-mount -t "proc" -o "rw" "proc" "/proc"
/mount-dev d m755
/mount-dev/dependencies
@@ -36,7 +36,7 @@ m644
/mount-dev/up
CN # mount dev on /dev
if { mkdir -p "/dev" }
- if -n -t { s6-mount -t "devtmpfs" -o "remount,rw,nosuid" "dev" "/dev" }
+ if -n -t { mount -t "devtmpfs" -o "remount,rw,nosuid" "dev" "/dev" }
s6-mount -t "devtmpfs" -o "rw,nosuid" "dev" "/dev"
/mount-dev-pts d m755
/mount-dev-pts/dependencies
@@ -47,7 +47,7 @@ m644
/mount-dev-pts/up
CN # mount devpts on /dev/pts
if { mkdir -p "/dev/pts" }
- if -n -t { s6-mount -t "devpts" -o "remount,rw,relatime,mode=600,ptmxmode=000" "devpts" "/dev/pts" }
+ if -n -t { mount -t "devpts" -o "remount,rw,relatime,mode=600,ptmxmode=000" "devpts" "/dev/pts" }
s6-mount -t "devpts" -o "rw,relatime,mode=600,ptmxmode=000" "devpts" "/dev/pts"
/mount-dev-shm d m755
/mount-dev-shm/dependencies
@@ -58,7 +58,7 @@ m644
/mount-dev-shm/up
CN # mount shm on /dev/shm
if { mkdir -p "/dev/shm" }
- if -n -t { s6-mount -t "tmpfs" -o "remount,rw,nosuid,nodev,relatime" "shm" "/dev/shm" }
+ if -n -t { mount -t "tmpfs" -o "remount,rw,nosuid,nodev,relatime" "shm" "/dev/shm" }
s6-mount -t "tmpfs" -o "rw,nosuid,nodev,relatime" "shm" "/dev/shm"
/mount-dev-mqueue d m755
/mount-dev-mqueue/dependencies
@@ -69,7 +69,7 @@ m644
/mount-dev-mqueue/up
CN # mount mqueue on /dev/mqueue
if { mkdir -p "/dev/mqueue" }
- if -n -t { s6-mount -t "mqueue" -o "remount,rw,nosuid,nodev,noexec" "mqueue" "/dev/mqueue" }
+ if -n -t { mount -t "mqueue" -o "remount,rw,nosuid,nodev,noexec" "mqueue" "/dev/mqueue" }
s6-mount -t "mqueue" -o "rw,nosuid,nodev,noexec" "mqueue" "/dev/mqueue"
/mount-run-cgroup2 d m755
/mount-run-cgroup2/down cN s6-umount "/run/cgroup2" m644
@@ -77,7 +77,7 @@ CN # mount mqueue on /dev/mqueue
/mount-run-cgroup2/up
CN # mount none on /run/cgroup2
if { mkdir -p "/run/cgroup2" }
- if -n -t { s6-mount -t "cgroup2" -o "remount,rw" "none" "/run/cgroup2" }
+ if -n -t { mount -t "cgroup2" -o "remount,rw" "none" "/run/cgroup2" }
s6-mount -t "cgroup2" -o "rw" "none" "/run/cgroup2"
/mount-boot d m755
/mount-boot/dependencies
@@ -89,7 +89,7 @@ m644
/mount-boot/up
CN # mount LABEL="SPARK_BOOT" on /boot
if { mkdir -p "/boot" }
- if -n -t { s6-mount -t "ext2" -o "remount,ro,noatime" "LABEL=\"SPARK_BOOT\"" "/boot" }
+ if -n -t { mount -t "ext2" -o "remount,ro,noatime" "LABEL=\"SPARK_BOOT\"" "/boot" }
s6-mount -t "ext2" -o "ro,noatime" "LABEL=\"SPARK_BOOT\"" "/boot"
/ok-sysinit d m755
/ok-sysinit/contents
