commit d4d8812908e64ae0e8ca233bfeef7e028d77acec
parent 68c2ffd5f266f0c27e3d0b9038872088235659f5
Author: ccx <ccx@te2000.cz>
Date: Tue, 27 Feb 2024 01:24:01 +0000
Create X.run script before the symlinks
Diffstat:
| M | s6-rc.aat | | | 25 | ++++++++++++------------- |
| M | s6-rc.fileset | | | 69 | ++++++++++++++++++++++++++++++++++----------------------------------- |
2 files changed, 46 insertions(+), 48 deletions(-)
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -195,8 +195,6 @@
/sbin/openrc shutdown
|end()
-/.scripts d m755
-
|start_longrun_with_logger("sshd", "ssh_host_ed25519_key ssh_host_rsa_key ok-sysinit")
|enabled_bundle("ok-all-but-tty")
|run_arg("/usr/sbin/sshd -D -e -f /etc/ssh/sshd_config")
@@ -324,17 +322,6 @@
|if(find("X_servers.rows")) {
-@for i in X_servers
-/{<i.svc>} d m750
-/{<i.svc>}/data d m750
-/{<i.svc>}/data/.keep cN m640
-/{<i.svc>}/env d m750
-/{<i.svc>}/env/vtN cN {<i.vtN>} m640
-/{<i.svc>}/notification-fd cN 3 m640
-/{<i.svc>}/run l ../.scripts/X.run m777
-/{<i.svc>}/type cN longrun m640
-@endfor
-
/.scripts d m755
/.scripts/X.run
CN #!/command/execlineb -P
@@ -400,6 +387,18 @@ CN #!/command/execlineb -P
vt${vtN} :${vtN}
m755
+
+@for i in X_servers
+/{<i.svc>} d m750
+/{<i.svc>}/data d m750
+/{<i.svc>}/data/.keep cN m640
+/{<i.svc>}/env d m750
+/{<i.svc>}/env/vtN cN {<i.vtN>} m640
+/{<i.svc>}/notification-fd cN 3 m640
+/{<i.svc>}/run l ../.scripts/X.run m777
+/{<i.svc>}/type cN longrun m640
+@endfor
+
|}
|print_bundles()
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -692,8 +692,6 @@ CN export TERM "linux"
/sbin/openrc shutdown
m644
-/.scripts d m755
-
/sshd-log d m755
/sshd-log/type cN longrun m644
/sshd-log/dependencies
@@ -1044,39 +1042,6 @@ CN #!/command/execlineb -P
m755
-/X5 d m750
-/X5/data d m750
-/X5/data/.keep cN m640
-/X5/env d m750
-/X5/env/vtN cN 5 m640
-/X5/notification-fd cN 3 m640
-/X5/run l ../.scripts/X.run m777
-/X5/type cN longrun m640
-/X6 d m750
-/X6/data d m750
-/X6/data/.keep cN m640
-/X6/env d m750
-/X6/env/vtN cN 6 m640
-/X6/notification-fd cN 3 m640
-/X6/run l ../.scripts/X.run m777
-/X6/type cN longrun m640
-/X7 d m750
-/X7/data d m750
-/X7/data/.keep cN m640
-/X7/env d m750
-/X7/env/vtN cN 7 m640
-/X7/notification-fd cN 3 m640
-/X7/run l ../.scripts/X.run m777
-/X7/type cN longrun m640
-/X8 d m750
-/X8/data d m750
-/X8/data/.keep cN m640
-/X8/env d m750
-/X8/env/vtN cN 8 m640
-/X8/notification-fd cN 3 m640
-/X8/run l ../.scripts/X.run m777
-/X8/type cN longrun m640
-
/.scripts d m755
/.scripts/X.run
CN #!/command/execlineb -P
@@ -1143,6 +1108,40 @@ CN #!/command/execlineb -P
m755
+/X5 d m750
+/X5/data d m750
+/X5/data/.keep cN m640
+/X5/env d m750
+/X5/env/vtN cN 5 m640
+/X5/notification-fd cN 3 m640
+/X5/run l ../.scripts/X.run m777
+/X5/type cN longrun m640
+/X6 d m750
+/X6/data d m750
+/X6/data/.keep cN m640
+/X6/env d m750
+/X6/env/vtN cN 6 m640
+/X6/notification-fd cN 3 m640
+/X6/run l ../.scripts/X.run m777
+/X6/type cN longrun m640
+/X7 d m750
+/X7/data d m750
+/X7/data/.keep cN m640
+/X7/env d m750
+/X7/env/vtN cN 7 m640
+/X7/notification-fd cN 3 m640
+/X7/run l ../.scripts/X.run m777
+/X7/type cN longrun m640
+/X8 d m750
+/X8/data d m750
+/X8/data/.keep cN m640
+/X8/env d m750
+/X8/env/vtN cN 8 m640
+/X8/notification-fd cN 3 m640
+/X8/run l ../.scripts/X.run m777
+/X8/type cN longrun m640
+
+
/gettys d m755
/gettys/type cN bundle m644
/gettys/contents
