mrrl-containers

commit 8b69fd1d417463a3ea4c2630f50d17087152bbfa
parent abd7303c49b833f7e489606b6eba3c3247a898c3
Author: ccx <ccx@te2000.cz>
Date:   Mon, 18 Mar 2024 00:45:19 +0000

Move generating xauth into the container

Diffstat:
M
service_scripts/xorg/run
 | 
16
+++++++++-------

1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/service_scripts/xorg/run b/service_scripts/xorg/run
@@ -37,13 +37,6 @@ if { truncate -s 0 ${CONTAINER_TMPFS}${XDG_RUNTIME_DIR}/Xauthority }
 if { chmod 600 ${CONTAINER_TMPFS}${XDG_RUNTIME_DIR}/Xauthority }
 if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}${XDG_RUNTIME_DIR}/Xauthority }
 if { chown ${CONTAINER_USER}:${CONTAINER_USER} ${CONTAINER_TMPFS}${XDG_RUNTIME_DIR} }
-if {
-  pipeline {
-    if { printf "add :%d . " ${vtN} }
-    if { redirfd -r 0 /dev/urandom xxd -p -l 16 }
-  }
-  xauth -f ${XDG_RUNTIME_DIR}/Xauthority source -
-}
 
 # # Create default resolv.conf
 # if { redirfd -w 1 ${CONTAINER_TMPFS}/run/resolv.conf printf "nameserver 127.0.0.1\n" }
@@ -74,6 +67,15 @@ env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
 
 s6-setsid
 s6-envuidgid xorg applyuidgid-caps -U ""
+
+if {
+  pipeline {
+    if { printf "add :%d . " ${vtN} }
+    if { redirfd -r 0 /dev/urandom xxd -p -l 16 }
+  }
+  xauth -f ${XDG_RUNTIME_DIR}/Xauthority source -
+}
+
 Xorg
   -displayfd 5
   -nolisten local