mrrl-system-config

commit 03820af99f687c691ac12d9f73f9a6552d8208bf
parent d60fd7adb2ed46631be41c4fc7e17fce0e4a3933
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 20:17:55 +0000

fix s6-rc paths

Diffstat:
M
postinstall
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/postinstall b/postinstall
@@ -64,17 +64,17 @@ setup_rc() {
 
 			s6-rc-compile $tmp_db $prev_source || return $?
 			s6-rc-format-upgrade -v2 $tmp_db || return $?
-			s6-rc-update -v2 $curr_db || return $?
+			s6-rc-update -v2 $curr_db:P || return $?
 			zf_rm -r $tmp_db || return $?
 		else
 			# Installed software changed but s6-rc DB source is the same.
 			# s6-rc-format-upgrade to new compiled DB directly
-			s6-rc-format-upgrade -v2 $curr_db || return $?
+			s6-rc-format-upgrade -v2 $curr_db:P || return $?
 		fi
 	elif (( $diff_ret == 1 )); then
 		# s6-rc DB source changed while keeping same version of software.
 		# s6-rc-update to new compiled DB directly
-		s6-rc-update -v2 $curr_db || return $?
+		s6-rc-update -v2 $curr_db:P || return $?
 	fi
 	s6-rc -v2 -u -t 30000 change ok-all
 	true
@@ -110,7 +110,7 @@ setup_fileset() {
 	$rsync --delete-excluded --log-file $SETUP_DIR/rsync.log.get / $SETUP_DIR/files.pre/ || return $?
 	cp -a --reflink=auto $SETUP_DIR/files.pre $SETUP_DIR/files.post || return $?
 	./command/fileset ./config/postinstall.fileset >$SETUP_DIR/files.sh || exit $?
-	(cd $SETUP_DIR/files.post && exec sh -x ../files.sh) || exit $?
+	(cd $SETUP_DIR/files.post && exec sh ../files.sh) || exit $?
 	zf_mkdir $SETUP_DIR/files.bak || return $?
 	revert+=( revert_fileset )
 	$rsync --log-file $SETUP_DIR/rsync.log.put $SETUP_DIR/files.post/ / --backup --backup-dir=$SETUP_DIR/files.bak || return $?