commit 4d8754ba3ffb68717a67e7f5f6ba428337e33174
parent 521eddc2a04c2a2148681cdb8dcf93f90a151a48
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date: Mon, 25 Jul 2022 11:33:53 +0200
Use distro mount for mounting
Diffstat:
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/s6-rc-mount.aat b/s6-rc-mount.aat
@@ -18,7 +18,7 @@ CN # mount {{get("source")}} on {{mtp}}
if { mkdir -p {{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}}
+ mount -t {{q_vfstype}} -o {{q_options}} {{q_spec}} {{q_file}}
|}
|### write_bundle ###
|function write_bundle(name) {
diff --git a/s6-rc-mount.awk b/s6-rc-mount.awk
@@ -18,7 +18,7 @@ if(boolean("mkdir")) {
printf "%s", " if { mkdir -p " (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"
+printf "%s", " mount -t " (q_vfstype) " -o " (q_options) " " (q_spec) " " (q_file) "\n"
}
### write_bundle ###
function write_bundle(name) {
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -4,7 +4,7 @@
/rootfs/up
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 -t "xfs" -o "rw,noatime" "LABEL=\"SPARK_ROOT\"" "/"
/mount-sys d m755
/mount-sys/dependencies
CN rootfs
@@ -15,7 +15,7 @@ m644
CN # mount sysfs on /sys
if { mkdir -p "/sys" }
if -n -t { mount -t "sysfs" -o "remount,rw" "sysfs" "/sys" }
- s6-mount -t "sysfs" -o "rw" "sysfs" "/sys"
+ mount -t "sysfs" -o "rw" "sysfs" "/sys"
/mount-proc d m755
/mount-proc/dependencies
CN rootfs
@@ -26,7 +26,7 @@ m644
CN # mount proc on /proc
if { mkdir -p "/proc" }
if -n -t { mount -t "proc" -o "remount,rw" "proc" "/proc" }
- s6-mount -t "proc" -o "rw" "proc" "/proc"
+ mount -t "proc" -o "rw" "proc" "/proc"
/mount-dev d m755
/mount-dev/dependencies
CN rootfs
@@ -37,7 +37,7 @@ m644
CN # mount dev on /dev
if { mkdir -p "/dev" }
if -n -t { mount -t "devtmpfs" -o "remount,rw,nosuid" "dev" "/dev" }
- s6-mount -t "devtmpfs" -o "rw,nosuid" "dev" "/dev"
+ mount -t "devtmpfs" -o "rw,nosuid" "dev" "/dev"
/mount-dev-pts d m755
/mount-dev-pts/dependencies
CN mount-dev
@@ -48,7 +48,7 @@ m644
CN # mount devpts on /dev/pts
if { mkdir -p "/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 -t "devpts" -o "rw,relatime,mode=600,ptmxmode=000" "devpts" "/dev/pts"
/mount-dev-shm d m755
/mount-dev-shm/dependencies
CN mount-dev
@@ -59,7 +59,7 @@ m644
CN # mount shm on /dev/shm
if { mkdir -p "/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 -t "tmpfs" -o "rw,nosuid,nodev,relatime" "shm" "/dev/shm"
/mount-dev-mqueue d m755
/mount-dev-mqueue/dependencies
CN mount-dev
@@ -70,7 +70,7 @@ m644
CN # mount mqueue on /dev/mqueue
if { mkdir -p "/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 -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
/mount-run-cgroup2/type cN oneshot m644
@@ -78,7 +78,7 @@ CN # mount mqueue on /dev/mqueue
CN # mount none on /run/cgroup2
if { mkdir -p "/run/cgroup2" }
if -n -t { mount -t "cgroup2" -o "remount,rw" "none" "/run/cgroup2" }
- s6-mount -t "cgroup2" -o "rw" "none" "/run/cgroup2"
+ mount -t "cgroup2" -o "rw" "none" "/run/cgroup2"
/mount-boot d m755
/mount-boot/dependencies
CN rootfs
@@ -90,7 +90,7 @@ m644
CN # mount LABEL="SPARK_BOOT" on /boot
if { mkdir -p "/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"
+ mount -t "ext2" -o "ro,noatime" "LABEL=\"SPARK_BOOT\"" "/boot"
/ok-sysinit d m755
/ok-sysinit/contents
CN mount-sys
