mrrl-containers

commit 5581f9d5a700e7aa2506dddd5c0c90b40d48174f
parent 26cbb8f507df1673b97a4103d94acc135096851c
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Thu, 13 Oct 2022 11:58:14 +0200

Fix condition for container-setup
Diffstat:
M
service_scripts/alsa/run
 | 
9
+++++----
M
service_scripts/generic/run
 | 
9
+++++----

2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/service_scripts/alsa/run b/service_scripts/alsa/run
@@ -35,10 +35,11 @@ s6-envuidgid ${CONTAINER_USER}
 
 # Run user's setup script (optional)
 if {
-	if -n -t { s6-test -e ${CONTAINER_USER_HOME}/container-setup }
-	env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
-	s6-applyuidgid -U
-	${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
+	ifelse { s6-test -x ${CONTAINER_USER_HOME}/container-setup } {
+		env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
+		s6-applyuidgid -U
+		${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
+	}
 }
 
 #multisubstitute { importas -i UID UID importas -i GID GID }
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -35,10 +35,11 @@ s6-envuidgid ${CONTAINER_USER}
 
 # Run user's setup script (optional)
 if {
-	if -n -t { s6-test -e ${CONTAINER_USER_HOME}/container-setup }
-	env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
-	s6-applyuidgid -U
-	${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
+	ifelse { s6-test -x ${CONTAINER_USER_HOME}/container-setup } {
+		env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
+		s6-applyuidgid -U
+		${CONTAINER_USER_HOME}/container-setup ${CONTAINER_TMPFS} ${CONTAINER_NAME}
+	}
 }
 
 env