mrrl-containers

commit 565177e7a6a8d9cfbf4e123fbf6ffbfc61f140dc
parent f85fea52403b33f78c25fc93c926bae29b794b76
Author: ccx <ccx@te2000.cz>
Date:   Tue, 19 Mar 2024 00:21:12 +0000

Run under trap -x so that it can create it's session

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

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/service_scripts/xorg/run b/service_scripts/xorg/run
@@ -1,6 +1,5 @@
 #!/command/execlineb -P
 fdmove -c 2 1
-s6-setsid
 
 s6-envdir env
 multisubstitute {
@@ -67,7 +66,6 @@ ns_run_unshared data/root {
 	if { chown root:xorg ./dev/tty${vtN} }
 }
 # This runs with changed / so use absolute paths before dropping privs
-#/mnt/ns/bin/s6-setsid
 /mnt/ns/bin/redirfd -r 0 /dev/tty${vtN}
 /mnt/ns/bin/redirfd -w 1 /dev/tty${vtN}
 /mnt/ns/bin/applyuidgid-caps -U ""
@@ -81,6 +79,7 @@ if {
 	xauth -f ${XDG_RUNTIME_DIR}/Xauthority source -
 }
 
+trap -x { USR2 { true } }
 Xorg
   -displayfd 5
   -nolisten local