mrrl-system-config

commit bda8575834ea1490cd6da7ccfe00ab0d3738671f
parent b0ac4d4c4a6fdac42f5d377e08a6ed554d4ec1fa
Author: ccx <ccx@te2000.cz>
Date:   Fri,  8 Mar 2024 11:14:40 +0000

fix executable paths

Diffstat:
M
rc-common.aat
 | 
22
+++++++++++-----------

1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/rc-common.aat b/rc-common.aat
@@ -23,19 +23,19 @@
 |function runscript_el_cgroup_v2(svc_name) {
 /{{svc_name}}/run
 CN	#!{{exec_path("execlineb")}} -P
-	{{qconfig("getpid")}} SERVICE_PID
-	{{qconfig("foreground")}} {
-		{{qconfig("importas")}} -i SERVICE_PID SERVICE_PID
-		{{qconfig("if")}} { {{qconfig("test")}} -d /run/cgroup }
-		{{qconfig("if")}} { {{qconfig("mkdir")}} -p /run/cgroup/s6-rc/{{svc_name}} }
-		{{qconfig("redirfd")}} -w 1 /run/cgroup/s6-rc/{{svc_name}}/cgroup.procs
-		{{qconfig("printf")}} "%s" ${SERVICE_PID}
+	{{qexec("getpid")}} SERVICE_PID
+	{{qexec("foreground")}} {
+		{{qexec("importas")}} -i SERVICE_PID SERVICE_PID
+		{{qexec("if")}} { {{qexec("test")}} -d /run/cgroup }
+		{{qexec("if")}} { {{qexec("mkdir")}} -p /run/cgroup/s6-rc/{{svc_name}} }
+		{{qexec("redirfd")}} -w 1 /run/cgroup/s6-rc/{{svc_name}}/cgroup.procs
+		{{qexec("printf")}} "%s" ${SERVICE_PID}
 	}
-	{{qconfig("unexport")}} SERVICE_PID
+	{{qexec("unexport")}} SERVICE_PID
 |}
 |function runscript_simple(svc_name, cmd) {
 |runscript_el_cgroup_v2(svc_name)
-	{{qconfig("fdmove")}} -c 2 1
+	{{qexec("fdmove")}} -c 2 1
 	{{cmd}}
 m755
 |}
@@ -43,8 +43,8 @@ m755
 |	longrun(name "-log", "mount-run-cgroup\nrootfs")
 /{{name}}-log/consumer-for	cN	{{name}}	m640
 |runscript_el_cgroup_v2(name "-log")
-	{{qconfig("if")}} { {{qconfig("mkdir")}} -p /var/log/{{name}} }
-	{{qconfig("s6-log")}} -b -- n10 s10240000 t /var/log/{{name}}
+	{{qexec("if")}} { {{qexec("mkdir")}} -p /var/log/{{name}} }
+	{{qexec("s6-log")}} -b -- n10 s10240000 t /var/log/{{name}}
 m755
 |	longrun(name, deps)
 /{{name}}/producer-for	cN	{{name}}-log	m640