mrrl-containers

commit 4d7b29904589de1652c66643d42bafb539cc3174
parent 9f2925da95bd5d58ef170ad1bd464bf8f7df7da0
Author: ccx <ccx@te2000.cz>
Date:   Sun, 24 Mar 2024 22:14:46 +0000

Full path for all the executables! Also mountinfo.

Diffstat:
M
service_scripts/generic/run
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -65,12 +65,15 @@ ns_run_unshared data/root {
 
 # This runs with changed / so use absolute paths before dropping privs
 /mnt/ns/bin/applyuidgid-caps -U ""
-env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
-ifelse { test -x ${CONTAINER_USER_HOME}/run/init } {
+/mnt/ns/bin/busybox env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
+/mnt/ns/bin/foreground {
+	cat /proc/self/mountinfo
+}
+/mnt/ns/bin/ifelse { test -x ${CONTAINER_USER_HOME}/run/init } {
 	${CONTAINER_USER_HOME}/run/init
 }
-foreground {
-	if -n {
+/mnt/ns/bin/foreground {
+	/mnt/ns/bin/if -n {
 		/mnt/ns/bin/busybox stat /mnt/init/run/init
 	} {
 		/mnt/ns/bin/busybox ls -lhA /mnt/init/run /mnt/init /mnt