mrrl-containers

commit 656ff61e679c83b52d154c975f404a3cce826f6a
parent c0895606e198ca1ed52c8d38f04538a80bc9eac0
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Tue, 19 Jan 2021 02:25:33 +0100

Add info about the display and tty to xsession envdir, unexport runscript variables.
Diffstat:
M
service_scripts/generic/run
 | 
6
+++---
M
service_scripts/xsession/run
 | 
9
+++++----
M
zsh-functions/confz_containers_init
 | 
4
++++

3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/service_scripts/generic/run b/service_scripts/generic/run
@@ -3,12 +3,12 @@
 #define CONTAINER_USER ccx
 s6-envdir env
 multisubstitute {
-	importas -i CONTAINER_NAME CONTAINER_NAME
-	importas -i CONTAINER_USER CONTAINER_USER
+	importas -i -u CONTAINER_NAME CONTAINER_NAME
+	importas -i -u CONTAINER_USER CONTAINER_USER
 }
 backtick -in CONTAINER_USER_HOME { homeof $CONTAINER_USER }
 multisubstitute {
-	importas -i CONTAINER_USER_HOME CONTAINER_USER_HOME
+	importas -i -u CONTAINER_USER_HOME CONTAINER_USER_HOME
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
 #	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
 	define -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix"
diff --git a/service_scripts/xsession/run b/service_scripts/xsession/run
@@ -1,12 +1,13 @@
 #!/command/execlineb
 s6-envdir env
 multisubstitute {
-	importas -i CONTAINER_NAME CONTAINER_NAME
-	importas -i CONTAINER_USER CONTAINER_USER
+	importas -i -u CONTAINER_NAME CONTAINER_NAME
+	importas -i -u CONTAINER_USER CONTAINER_USER
 }
 backtick -in CONTAINER_USER_HOME { homeof $CONTAINER_USER }
 multisubstitute {
-	importas -i CONTAINER_USER_HOME CONTAINER_USER_HOME
+	importas -i -u CONTAINER_USER_HOME CONTAINER_USER_HOME
+	importas -i -u vtN vtN
 	define CONTAINER_TMPFS /run/containers/${CONTAINER_NAME}.${CONTAINER_USER}
 #	define CONTAINER_DATA /mnt/volumes/containers/user/${CONTAINER_USER}/${CONTAINER_NAME}
 	define -s tmpfs_dirs "home run tmp inbox run/inbox tmp/.X11-unix"
@@ -24,7 +25,7 @@ s6-envuidgid ${CONTAINER_USER}
 if {
 	env HOME=${CONTAINER_USER_HOME}
 	s6-applyuidgid -U
-	${CONTAINER_USER_HOME}/xsession-setup ${CONTAINER_TMPFS} 6
+	${CONTAINER_USER_HOME}/xsession-setup ${CONTAINER_TMPFS} ${vtN}
 }
 
 env
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -202,6 +202,10 @@ confz_container_service_xsession_check() {
 		content=$vars[user]
 	require fs_contentnl filename=$svc_dir/env/CONTAINER_NAME \
 		content=$container
+	require fs_contentnl filename=$svc_dir/env/DISPLAY \
+		content=:$vars[display_number]
+	require fs_contentnl filename=$svc_dir/env/vtN \
+		content=$vars[display_number]
 }
 
 # --- old