carbon-config

commit bd5c28eb349b5ba87542c5326709bb83fc4a8cda
parent 8d638336fe0bfa371b1c433fff3c78ccf8376811
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Fri, 16 Sep 2022 02:57:41 +0200

Add back setfont service.

Diffstat:
M
config.aat
 | 
2
++
M
s6-rc.aat
 | 
28
++++++++--------------------
M
s6-rc.fileset
 | 
24
+++++++++++++++++++++++-

3 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/config.aat b/config.aat
@@ -9,6 +9,8 @@ tty_max=4
 # Number of gettys to spawn (should be less 9 to not overlap with rescue getty)
 getty_max=4
 
+tty_setfont=ter-v14n
+
 X_servers=[
 svc	vtN
 X5	5
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -215,27 +215,15 @@ m644
 /kbd_mode-tty{{tty}}/up	cN	kbd_mode -u -C /dev/tty{{tty}}	m644
 |}
 
+|if(get("tty_setfont")) {
 |add_to_bundle("ok-all-but-tty", "setfont")
-|#/setfont	d	m755
-|#/setfont/contents
-|#CN	setfont-tty1
-|#	setfont-tty2
-|#	setfont-tty3
-|#	setfont-tty4
-|#m644
-|#/setfont-tty1	d	m755
-|#/setfont-tty1/type	cN	oneshot	m644
-|#/setfont-tty1/up	cN	redirfd -r 0 /dev/tty1 setfont ter-v14n	m644
-|#/setfont-tty2	d	m755
-|#/setfont-tty2/type	cN	oneshot	m644
-|#/setfont-tty2/up	cN	redirfd -r 0 /dev/tty2 setfont ter-v14n	m644
-|#/setfont-tty3	d	m755
-|#/setfont-tty3/type	cN	oneshot	m644
-|#/setfont-tty3/up	cN	redirfd -r 0 /dev/tty3 setfont ter-v14n	m644
-|#/setfont-tty4	d	m755
-|#/setfont-tty4/type	cN	oneshot	m644
-|#/setfont-tty4/up	cN	redirfd -r 0 /dev/tty4 setfont ter-v14n	m644
-|#/setfont/type	cN	bundle	m644
+|for(tty=1; tty<=(<tty_max>+0); tty++) {
+|add_to_bundle("setfont", "setfont-tty" tty)
+/setfont-tty{{tty}}	d	m755
+/setfont-tty{{tty}}/type	cN	oneshot	m644
+/setfont-tty{{tty}}/up	cN	redirfd -r 0 /dev/tty{{tty}} setfont {<tty_setfont>}	m644
+|}
+|}
 
 |add_to_bundle("ok-all-but-tty", "dmesg")
 /dmesg	d	m755
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -339,6 +339,18 @@ m644
 /kbd_mode-tty4/type	cN	oneshot	m644
 /kbd_mode-tty4/up	cN	kbd_mode -u -C /dev/tty4	m644
 
+/setfont-tty1	d	m755
+/setfont-tty1/type	cN	oneshot	m644
+/setfont-tty1/up	cN	redirfd -r 0 /dev/tty1 setfont ter-v14n	m644
+/setfont-tty2	d	m755
+/setfont-tty2/type	cN	oneshot	m644
+/setfont-tty2/up	cN	redirfd -r 0 /dev/tty2 setfont ter-v14n	m644
+/setfont-tty3	d	m755
+/setfont-tty3/type	cN	oneshot	m644
+/setfont-tty3/up	cN	redirfd -r 0 /dev/tty3 setfont ter-v14n	m644
+/setfont-tty4	d	m755
+/setfont-tty4/type	cN	oneshot	m644
+/setfont-tty4/up	cN	redirfd -r 0 /dev/tty4 setfont ter-v14n	m644
 
 /dmesg	d	m755
 /dmesg/type	cN	oneshot	m644
@@ -541,7 +553,7 @@ m640
 /containers/up
 CN	export TERM "linux"
 	if {
-		zsh -lc "quiet=1 confz site_container_service"
+		zsh -lc "quiet=1 confz site_container_services"
 	}
 	s6-svscanctl -a /run/service
 m644
@@ -774,6 +786,16 @@ C	net-all
 	
 m644
 
+/setfont	d	m755
+/setfont/type	cN	bundle	m644
+/setfont/contents
+C	setfont-tty1
+	setfont-tty2
+	setfont-tty3
+	setfont-tty4
+	
+m644
+
 /net-all	d	m755
 /net-all/type	cN	bundle	m644
 /net-all/contents