commit d60fd7adb2ed46631be41c4fc7e17fce0e4a3933 parent 7eaf2315843e3955ccf33e69c2036075049423a1 Author: ccx <ccx@te2000.cz> Date: Thu, 7 Mar 2024 20:09:55 +0000 fix s6-rc paths Diffstat:
| M | postinstall | | | 21 | ++++++++++++--------- |
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/postinstall b/postinstall @@ -41,16 +41,19 @@ fatal111() { # functions link_changed() { - local prev cur + local prev curr prev=${${:-$prev_env/$1}:P} - post=${${:-$current_env/$1}:P} - [[ "$prev" != "$post" ]] + curr=${${:-$current_env/$1}:P} + [[ "$prev" != "$curr" ]] } setup_rc() { - local diff_ret + local diff_ret prev_source curr_source + prev_source=$prev_env/config/s6-rc-source + curr_source=./config/s6-rc-source + curr_db=./config/s6-rc-db # Check if s6-rc definition changed - diff --recursive --unified $prev_env/config/s6-rc-source ./config/s6-rc-source; diff_ret=$? + diff --recursive --unified $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 @@ -59,19 +62,19 @@ setup_rc() { # s6-rc-format-upgrade to tmpdir, then s6-rc-update local tmp_db=/run/old-s6-rc-db-migration.$EPOCHREALTIME - s6-rc-compile $tmp_db $preinstall_current_p/s6-rc-source || return $? + s6-rc-compile $tmp_db $prev_source || return $? s6-rc-format-upgrade -v2 $tmp_db || return $? - s6-rc-update -v2 /current/s6-rc-db/ || return $? + s6-rc-update -v2 $curr_db || 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 /current/s6-rc-db/ || return $? + s6-rc-format-upgrade -v2 $curr_db || 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 /current/s6-rc-db/ || return $? + s6-rc-update -v2 $curr_db || return $? fi s6-rc -v2 -u -t 30000 change ok-all true