commit a3dc2088bd8f968d6c83cbe10f2c69d3501ead14
parent b43e166e7f007e7b207a075254085c219b462ec2
Author: ccx <root@dorje.wpr.cz>
Date: Fri, 16 Sep 2022 19:16:18 +0200
Mount /tmp/.X11-unix
Diffstat:
| M | s6-rc.aat | | | 41 | +++++++++++++++++------------------------ |
| M | s6-rc.fileset | | | 69 | +++++++++++++++++++++++++++++++++++++++++++++------------------------ |
2 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -72,12 +72,9 @@ m644
|add_to_bundle("ok-sysinit", "dev-coldplug")
|add_to_bundle("ok-all-but-tty", "ok-mount")
-/ok-mount d m755
-/ok-mount/type cN bundle m644
-/ok-mount/contents
-CN ok-sysinit
- ok-localmount
-m644
+
+|add_to_bundle("ok-mount", "ok-sysinit")
+|add_to_bundle("ok-mount", "ok-localmount")
|### Networking ###
|add_to_bundle("net-all", "loopback")
@@ -172,16 +169,8 @@ m755
|### per-TTY services ###
-/gettys d m755
-/gettys/type cN bundle m644
-/gettys/contents
-|printf "CN"
-|for(tty=1; tty<=(<getty_max>+0); tty++) {
- tty{{tty}}
-|}
-m644
-
|for(tty=1; tty<=(<getty_max>+0); tty++) {
+|add_to_bundle("gettys", "tty" tty)
/tty{{tty}} d m755
/tty{{tty}}/type cN longrun m644
/tty{{tty}}/dependencies cN ok-sysinit m644
@@ -209,16 +198,8 @@ CN #!/command/execlineb -P
m755
|}
-/kbd_mode d m755
-/kbd_mode/type cN bundle m644
-/kbd_mode/contents
-CN kbd_mode-tty1
-|for(tty=2; tty<=(<tty_max>+0); tty++) {
- kbd_mode-tty{{tty}}
-|}
-m644
-
|for(tty=1; tty<=(<tty_max>+0); tty++) {
+|add_to_bundle("kbd_mode", "kbd_mode-tty" tty)
/kbd_mode-tty{{tty}} d m755
/kbd_mode-tty{{tty}}/type cN oneshot m644
/kbd_mode-tty{{tty}}/up cN kbd_mode -u -C /dev/tty{{tty}} m644
@@ -313,6 +294,18 @@ m644
/swapon-vg-swap/up c swapon /dev/vg/swap m644
/swapon-vg-swap/down c swapoff /dev/vg/swap m644
+|add_to_bundle("ok-mount", "mount-tmp-X11")
+|oneshot("mount-tmp-X11", "ok-sysinit")
+/mount-tmp-X11/up
+CN if { mkdir -p /tmp/.X11-unix /run/X11 }
+ if { chmod 771 /run/X11 }
+ if { chown root:xorg /run/X11 }
+ mount --bind /run/X11 /tmp/.X11-unix
+m644
+/mount-tmp-X11/down
+CN foreground { umount /tmp/.X11-unix }
+m644
+
/openrc d m755
/openrc/type cN oneshot m644
/openrc/dependencies
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -239,12 +239,7 @@ m644
-/ok-mount d m755
-/ok-mount/type cN bundle m644
-/ok-mount/contents
-CN ok-sysinit
- ok-localmount
-m644
+
/loopback d m755
/loopback/type cN oneshot m644
@@ -311,15 +306,6 @@ m755
/loadkeys/up cN loadkeys --unicode /root/keymap m644
-/gettys d m755
-/gettys/type cN bundle m644
-/gettys/contents
-CN tty1
- tty2
- tty3
- tty4
-m644
-
/tty1 d m755
/tty1/type cN longrun m644
/tty1/dependencies cN ok-sysinit m644
@@ -421,15 +407,6 @@ CN #!/command/execlineb -P
flock /run/ttylock/tty4 true
m755
-/kbd_mode d m755
-/kbd_mode/type cN bundle m644
-/kbd_mode/contents
-CN kbd_mode-tty1
- kbd_mode-tty2
- kbd_mode-tty3
- kbd_mode-tty4
-m644
-
/kbd_mode-tty1 d m755
/kbd_mode-tty1/type cN oneshot m644
/kbd_mode-tty1/up cN kbd_mode -u -C /dev/tty1 m644
@@ -554,6 +531,21 @@ m644
/swapon-vg-swap/up c swapon /dev/vg/swap m644
/swapon-vg-swap/down c swapoff /dev/vg/swap m644
+/mount-tmp-X11 d m755
+/mount-tmp-X11/type cN oneshot m644
+/mount-tmp-X11/dependencies
+C ok-sysinit
+m644
+/mount-tmp-X11/up
+CN if { mkdir -p /tmp/.X11-unix /run/X11 }
+ if { chmod 771 /run/X11 }
+ if { chown root:xorg /run/X11 }
+ mount --bind /run/X11 /tmp/.X11-unix
+m644
+/mount-tmp-X11/down
+CN foreground { umount /tmp/.X11-unix }
+m644
+
/openrc d m755
/openrc/type cN oneshot m644
/openrc/dependencies
@@ -923,6 +915,25 @@ CN #!/command/execlineb -P
m755
+/kbd_mode d m755
+/kbd_mode/type cN bundle m644
+/kbd_mode/contents
+C kbd_mode-tty1
+ kbd_mode-tty2
+ kbd_mode-tty3
+ kbd_mode-tty4
+
+m644
+
+/ok-mount d m755
+/ok-mount/type cN bundle m644
+/ok-mount/contents
+C ok-sysinit
+ ok-localmount
+ mount-tmp-X11
+
+m644
+
/setfont d m755
/setfont/type cN bundle m644
/setfont/contents
@@ -962,6 +973,16 @@ C mount-sysinit
m644
+/gettys d m755
+/gettys/type cN bundle m644
+/gettys/contents
+C tty1
+ tty2
+ tty3
+ tty4
+
+m644
+
/net-all d m755
/net-all/type cN bundle m644
/net-all/contents
