Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-08-01 13:26:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 1.2.2.3 beta

Browse Source
This commit is contained in:
MacRimi
2026-07-08 15:20:38 +02:00
parent 04a1cffe7f
commit 8b6fdcf9e1
5 changed files with 258 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/backup_restore/lib_host_backup_common.sh
+15 -3
View File
@@ -1485,13 +1485,17 @@ _hb_pbs_create_new_keyfile() {
# 4. Finalize per mode. On mode='none' we skip finalize entirely —
# no envelope, no msgbox. The operator was already told in the
# upload prompt where the keyfile lives; the backup summary
# reprints "Encryption: Enabled" when the run starts.
# reprints "Encryption: Enabled" when the run starts. Any
# envelope leftover from a previous keyfile is dropped so the
# runner does not upload a stale, undecipherable blob.
if [[ "$mode" != "none" ]]; then
if ! _hb_pbs_finalize_recovery "$pass" "$mode"; then
rm -f "$key_file" "$recovery_enc" 2>/dev/null
HB_PBS_KEYFILE_OPT=""
return 1
fi
else
rm -f "$recovery_enc" 2>/dev/null || true
fi
_hb_pbs_write_escrow_mode "$mode"
@@ -1593,13 +1597,17 @@ _hb_pbs_import_dialog() {
# 8. Finalize per mode. mode='none' skips finalize (no envelope,
# no msgbox) — the operator was already told in the upload
# prompt where the keyfile lives.
# prompt where the keyfile lives. Any leftover envelope from a
# previous keyfile (wrapped with the OLD key) is dropped here so
# the runner does not upload a stale, undecipherable blob.
if [[ "$mode" != "none" ]]; then
if ! _hb_pbs_finalize_recovery "$pass" "$mode"; then
rm -f "$key_file" "$recovery_enc" "$keyfile_pass_file" 2>/dev/null
HB_PBS_KEYFILE_OPT=""
return 1
fi
else
rm -f "$recovery_enc" 2>/dev/null || true
fi
_hb_pbs_write_escrow_mode "$mode"
@@ -1647,13 +1655,17 @@ _hb_pbs_reuse_pve_keyfile() {
HB_PBS_ENC_PASS=""
# 5. Finalize per mode. mode='none' skips finalize (no envelope,
# no msgbox).
# no msgbox). Drop any envelope left over from a previous
# keyfile — it is wrapped with an OLD key the runner cannot
# decrypt any more.
if [[ "$mode" != "none" ]]; then
if ! _hb_pbs_finalize_recovery "$pass" "$mode"; then
rm -f "$key_file" "$recovery_enc" 2>/dev/null
HB_PBS_KEYFILE_OPT=""
return 1
fi
else
rm -f "$recovery_enc" 2>/dev/null || true
fi
_hb_pbs_write_escrow_mode "$mode"