mrrl-system-config

commit 7b63e9ab32c2044b5abefbdadc73a519b967897b
parent bda8575834ea1490cd6da7ccfe00ab0d3738671f
Author: ccx <ccx@te2000.cz>
Date:   Fri,  8 Mar 2024 11:38:32 +0000

fix cgconfig.conf path

Diffstat:
M
postinstall
 | 
4
++--
M
s6-rc.aat
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/postinstall b/postinstall
@@ -53,7 +53,7 @@ setup_rc() {
 	curr_source=./config/s6-rc-source
 	curr_db=./config/s6-rc-db
 	# Check if s6-rc definition changed
-	diff --recursive --unified $prev_source $curr_source; diff_ret=$?
+	diff -r -q $prev_source $curr_source; diff_ret=$?
 	(( $diff_ret == 0 || $diff_ret == 1 )) || \
 		die111 "Could not diff s6-rc-source directories; exitcode $diff_ret"
 	if link_changed command/s6-rc; then
@@ -117,7 +117,7 @@ setup_fileset() {
 }
 
 revert_fileset() {
-	$rsync --log-file $SETUP_DIR/rsync.log.revert $SETUP_DIR/files.bak/ /
+	rsync -a --log-format=$'%i\t%B\t%U:%G\t%M\t%l\t%n' --log-file $SETUP_DIR/rsync.log.revert $SETUP_DIR/files.bak/ /
 }
 
 setup_containers() {
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -130,7 +130,7 @@
 |start_oneshot("cgroups", "mount-run-cgroup")
 |in_bundle("ok-sysinit")
 |up()
-	cgconfigparser -l /current/config/etc/cgconfig.conf
+	cgconfigparser -l {{qconfig("cgconfig.conf")}}
 |end()
 
 |start_oneshot("mdevd-coldplug", "mount-dev mount-sys modules mdevd")