mrrl-containers

commit d0a0d0da7e4e0aa91b6ecd119ff8cb7ab496bb26
parent 8b69fd1d417463a3ea4c2630f50d17087152bbfa
Author: ccx <ccx@te2000.cz>
Date:   Mon, 18 Mar 2024 01:22:28 +0000

Support busybox mount for mounting container directories

Diffstat:
M
sbin/ns_run
 | 
2
+-
M
service_scripts/alsa/run
 | 
2
+-
M
service_scripts/generic/run
 | 
2
+-
M
service_scripts/sysroot/run
 | 
2
+-
M
service_scripts/xorg/run
 | 
3
+--
M
service_scripts/xsession/run
 | 
2
+-

6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/sbin/ns_run b/sbin/ns_run
@@ -142,7 +142,7 @@ unexport NS_EXTRA
 if {
 	if -t { eltest -v NS_FSTAB }
 	importas -i NS_FSTAB NS_FSTAB
-	mount -a --fstab $NS_FSTAB
+	mount -a -T $NS_FSTAB
 }
 unexport NS_FSTAB
 
diff --git a/service_scripts/alsa/run b/service_scripts/alsa/run
@@ -33,7 +33,7 @@ if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { redirfd -w 1 ${CONTAINER_TMPFS}/run/resolv.conf printf "nameserver 127.0.0.1\n" }
 if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}/run/resolv.conf }
 
-if { mount -a --fstab data/fstab }
+if { mount -a -T data/fstab }
 
 # Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
 s6-envuidgid ${CONTAINER_USER}
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -33,7 +33,7 @@ if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { redirfd -w 1 ${CONTAINER_TMPFS}/run/resolv.conf printf "nameserver 127.0.0.1\n" }
 if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}/run/resolv.conf }
 
-if { mount -a --fstab data/fstab }
+if { mount -a -T data/fstab }
 
 # Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
 s6-envuidgid ${CONTAINER_USER}
diff --git a/service_scripts/sysroot/run b/service_scripts/sysroot/run
@@ -33,7 +33,7 @@ if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { redirfd -w 1 ${CONTAINER_TMPFS}/run/resolv.conf printf "nameserver 127.0.0.1\n" }
 if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}/run/resolv.conf }
 
-if { mount -a --fstab data/fstab }
+if { mount -a -T data/fstab }
 
 # Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
 s6-envuidgid ${CONTAINER_USER}
diff --git a/service_scripts/xorg/run b/service_scripts/xorg/run
@@ -42,12 +42,11 @@ if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}${XDG_RUNTIME_D
 # if { redirfd -w 1 ${CONTAINER_TMPFS}/run/resolv.conf printf "nameserver 127.0.0.1\n" }
 # if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}/run/resolv.conf }
 
-if { mount -a --fstab data/fstab }
+if { mount -a -T data/fstab }
 
 # Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
 s6-envuidgid ${CONTAINER_USER}
 
-
 env
   HOST=${CONTAINER_NAME}
   #RUN_CHOWN=${UID}:${GID}
diff --git a/service_scripts/xsession/run b/service_scripts/xsession/run
@@ -29,7 +29,7 @@ if { rm -rf ${CONTAINER_TMPFS} }
 if { mkdir -p ${CONTAINER_TMPFS}/${tmpfs_dirs} ${CONTAINER_TMPFS}/mnt/${CONTAINER_MNT_DIRS} }
 if { chmod 1770 ${CONTAINER_TMPFS}/${tmpfs_dirs} }
 if { chown root:${CONTAINER_USER} ${CONTAINER_TMPFS}/${tmpfs_dirs} }
-if { mount -a --fstab data/fstab }
+if { mount -a -T data/fstab }
 
 # Put UID/GID/GIDLIST into environment for use by s6-applyuidgid below
 s6-envuidgid ${CONTAINER_USER}