mrrl-system-config

commit c78db535c5810264a39114ad04b3ec47d1177a6f
parent 7ce6de0ff3b5ebdb4172b73ef910aa572ed83f5b
Author: ccx <ccx@te2000.cz>
Date:   Wed, 13 Mar 2024 18:58:26 +0000

Replace generic tty cleanup by just shutting down the related X service

Diffstat:
M
s6-rc.aat
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -84,13 +84,12 @@
 |run_el()
 	{{qexec("foreground")}} { {{qexec("issue-gen")}} }
 	{{qexec("env")}} LOGIN_TTY=/dev/tty{{tty}} {{qexec("getty")}} -l {{qexec("login-keepenv")}} 38400 tty{{tty}} linux
+|if(tty >= 1 && tty <= 4) {
 |finish_el()
-	{{qexec("redirfd")}} -w 1 /dev/tty{{tty}}
-	{{qexec("fdmove")}} -c 2 1
-	{{qexec("foreground")}} { {{qexec("printf")}} "\n%s\n" "waiting for session cleanup" }
-	{{qexec("flock")}} /run/ttylock/tty{{tty}} {{qexec("true")}}
+	{{qexec("s6-svc")}} -wD -d /run/service/X{{tty + 4}}
 |end()
 |}
+|}
 
 |for(tty=1; tty<=(<tty_max>+0); tty++) {
 |start_oneshot("kbd_mode-tty" tty)