mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-10-09 06:56:37 +00:00
fix: more messages say only what is certain
- Host restore notification: reports its tasks and no longer calls the node fully ready. - Watchdog notification: covers an application that did not start as well as one that stopped again. - OCI: Modify summary, Immich recognition preview, private network kept by another guest, empty USB list. - gzip diagnostic no longer says that nothing changed. Source questions from the Italian review by @f3rs3n.
This commit is contained in:
@@ -1707,12 +1707,12 @@ EOF
|
||||
src="$gz"
|
||||
gzip_is_binary "$src" || src=/bin/gzip.original
|
||||
if ! gzip_is_binary "$src"; then
|
||||
ensure_gzip_binary "$gz" || { msg_error "$(translate "gzip could not be verified, leaving it unchanged")"; return 1; }
|
||||
ensure_gzip_binary "$gz" || { msg_error "$(translate "gzip could not be verified; the change was not completed")"; return 1; }
|
||||
src="$gz"
|
||||
fi
|
||||
if ! pmx_write_file "$gz.distrib" < "$src" || ! chmod 755 "$gz.distrib" || ! gzip_is_binary "$gz.distrib"; then
|
||||
rm -f "$gz.distrib"
|
||||
msg_error "$(translate "gzip could not be verified, leaving it unchanged")"
|
||||
msg_error "$(translate "gzip could not be verified; the change was not completed")"
|
||||
return 1
|
||||
fi
|
||||
pmx_remove_file /bin/gzip.original
|
||||
@@ -1729,10 +1729,10 @@ EOF
|
||||
# Never put the wrapper in place without a real gzip behind it. With the
|
||||
# diversion active, a reinstall writes straight into gzip.distrib.
|
||||
real=$(dpkg-divert --truename "$gz")
|
||||
ensure_gzip_binary "$real" || { msg_error "$(translate "gzip could not be verified, leaving it unchanged")"; return 1; }
|
||||
ensure_gzip_binary "$real" || { msg_error "$(translate "gzip could not be verified; the change was not completed")"; return 1; }
|
||||
if ! cmp -s "$gz" /bin/pigzwrapper && ! pmx_write_file "$gz" < /bin/pigzwrapper; then
|
||||
pmx_write_file "$gz" < "$real"
|
||||
msg_error "$(translate "gzip could not be verified, leaving it unchanged")"
|
||||
msg_error "$(translate "gzip could not be verified; the change was not completed")"
|
||||
return 1
|
||||
fi
|
||||
msg_ok "$(translate "gzip replaced with pigz wrapper successfully")"
|
||||
|
||||
@@ -1094,7 +1094,7 @@ uninstall_pigz() {
|
||||
# With the diversion still active, a reinstall writes into $real.
|
||||
if ! ensure_gzip_binary "$real" || ! pmx_write_file "$gz" < "$real"; then
|
||||
pmx_write_file "$gz" < /bin/pigzwrapper
|
||||
msg_error "$(translate "gzip could not be verified, leaving it unchanged")"
|
||||
msg_error "$(translate "gzip could not be verified; the change was not completed")"
|
||||
return 1
|
||||
fi
|
||||
pmx_record_execution "Remove gzip diversion" "dpkg-divert --local --no-rename --remove $gz"
|
||||
@@ -1116,7 +1116,7 @@ uninstall_pigz() {
|
||||
rm -f "$real"
|
||||
done
|
||||
# pigz is still what gzip runs if anything above went wrong.
|
||||
ensure_gzip_binary "$gz" || { msg_error "$(translate "gzip could not be verified, leaving it unchanged")"; return 1; }
|
||||
ensure_gzip_binary "$gz" || { msg_error "$(translate "gzip could not be verified; the change was not completed")"; return 1; }
|
||||
pmx_remove_file /bin/pigzwrapper
|
||||
pmx_edit_file /etc/vzdump.conf 's/^pigz: 1/#pigz: 1/' 2>/dev/null || true
|
||||
pmx_record_execution "Purge pigz package" "apt-get purge -y pigz"
|
||||
|
||||
Reference in New Issue
Block a user