mrrl-system-config

commit eb2f9a71bb07c73d73cce36ba69e1440180f6b29
parent eea35c1b742ef1e5637c84a2f2e4720172513f4b
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 19:51:14 +0000

fix paths

Diffstat:
M
config.aat
 | 
2
+-
M
s6-rc-mount.aat
 | 
10
+++++-----
M
s6-rc.aat
 | 
2
+-

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/config.aat b/config.aat
@@ -13,7 +13,7 @@ tty_setfont=ter-v16n
 
 dev_manager=mdevd
 
-enable_loopback=1
+#enable_loopback=1
 enable_dhcpcd=1
 enable_unbound=1
 enable_loadkeys=1
diff --git a/s6-rc-mount.aat b/s6-rc-mount.aat
@@ -4,17 +4,17 @@
 |function write_oneshot() {
 |oneshot(svc_name, dependencies())
 |if(down_umount()) {
-/{{svc_name}}/down	cN	{{qconfig("s6-umount")}} {{qget()}}	m644
+/{{svc_name}}/down	cN	{{qexec("s6-umount")}} {{qget()}}	m644
 |} else if (down_readonly()) {
-/{{svc_name}}/down	cN	{{qconfig("mount")}} -o remount,ro {{qget()}}	m644
+/{{svc_name}}/down	cN	{{qexec("mount")}} -o remount,ro {{qget()}}	m644
 |}
 /{{svc_name}}/up
 CN	# mount {{get("source")}} on {{mtp}}
 |if(boolean("mkdir")) {
-	{{qconfig("if")}} { {{qconfig("mkdir")}} -p {{qget()}} }
+	{{qexec("if")}} { {{qexec("mkdir")}} -p {{qget()}} }
 |}
-	{{qconfig("if")}} -n -t { {{qconfig("mount")}} -t {{qget("type")}} -o {{qget("remount_options")}} {{qget("source")}} {{qget()}} }
-	{{qconfig("mount")}} -t {{qget("type")}} -o {{qget("options")}} {{qget("source")}} {{qget()}}
+	{{qexec("if")}} -n -t { {{qexec("mount")}} -t {{qget("type")}} -o {{qget("remount_options")}} {{qget("source")}} {{qget()}} }
+	{{qexec("mount")}} -t {{qget("type")}} -o {{qget("options")}} {{qget("source")}} {{qget()}}
 |}
 |### include main loop / parsing code ###
 @awk parse_fs.include.awk
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -71,7 +71,7 @@
 |start_oneshot("loadkeys", "kbd_mode")
 |enabled_bundle("ok-all-but-tty")
 |up()
-	{{qexec("cd")}} {{qconfig("config/console_keymap")}} {{qexec("loadkeys")}} --unicode keymap
+	{{qexec("cd")}} {{qconfig("console_keymap")}} {{qexec("loadkeys")}} --unicode keymap
 |end()
 
 |### per-TTY services ###