OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(configure): don't update config if patch apply/revert fails

Browse Source
This commit is contained in:
Meliox 2026-06-14 00:56:37 +02:00
parent a578dc6ec4
commit 74df752cc4
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Scripts/apply-patches.sh
View File

@ -105,7 +105,11 @@ fi
mapfile -t _all_modules < <(list_modules) mapfile -t _all_modules < <(list_modules)
_target_modules=("${@:-${_all_modules[@]}}") _target_modules=("${@:-${_all_modules[@]}}")
for mod in "${_target_modules[@]}"; do for mod in "${_target_modules[@]}"; do
[[ "$(read_conf "$MAIN_CONF" modules "$mod" 0)" == "1" ]] || continue # When modules are explicitly named as args, the caller decides what to apply.
# When running for all modules (no args from dpkg trigger), respect the config.
if [[ $# -eq 0 ]]; then
[[ "$(read_conf "$MAIN_CONF" modules "$mod" 0)" == "1" ]] || continue
fi
mod_dir="$PATCHES_DIR/$mod" mod_dir="$PATCHES_DIR/$mod"
manifest="$mod_dir/patches.list" manifest="$mod_dir/patches.list"

19
src/Scripts/pve-mod-configure
View File

@ -632,19 +632,20 @@ main() {
esac esac
# ── Write config and apply/revert ───────────────────────────────────────── # ── Write config and apply/revert ─────────────────────────────────────────
write_config
# For mods with patches: apply if being enabled, revert if being disabled. # For mods with patches: apply if being enabled, revert if being disabled.
# Option 3 (pve_trigger) has no patches — write_config is sufficient. # Option 3 (pve_trigger) has no patches — write_config is sufficient.
if [[ -n "$selected_mod" ]]; then if [[ "$patching_needed" == "1" ]]; then
if [[ "$patching_needed" == "1" ]]; then msgb "\n=== Applying patches ==="
msgb "\n=== Applying patches ===" if ! "$APPLY_PATCHES" "$selected_mod"; then
"$APPLY_PATCHES" "$selected_mod" err "Could not apply all patches for $selected_mod. Configuration was not updated."
else fi
msgb "\n=== Removing patches ===" elif [[ -n "$selected_mod" ]]; then
"$REVERT_PATCHES" "$selected_mod" msgb "\n=== Removing patches ==="
if ! "$REVERT_PATCHES" "$selected_mod"; then
err "Could not revert all patches for $selected_mod. Configuration was not updated."
fi fi
fi fi
write_config
msgb "\n=== Done ===" msgb "\n=== Done ==="
info "pve-mod is configured and active." info "pve-mod is configured and active."

11
src/Scripts/revert-patches.sh
View File

@ -39,7 +39,7 @@ revert_one_patch() {
fi fi
warn " $(basename "$patch") could not be reverted cleanly; manual cleanup may be needed" warn " $(basename "$patch") could not be reverted cleanly; manual cleanup may be needed"
patch -R -p1 -F0 -f --dry-run --verbose -d "$PVE_MOD_ROOT" < "$patch" >&2 || true patch -R -p1 -F0 -f --dry-run --verbose -d "$PVE_MOD_ROOT" < "$patch" >&2 || true
return 1 return 2
} }
# ── main ────────────────────────────────────────────────────────────────────── # ── main ──────────────────────────────────────────────────────────────────────
@ -51,6 +51,7 @@ fi
[[ -d "$PATCHES_DIR" ]] || exit 0 [[ -d "$PATCHES_DIR" ]] || exit 0
CHANGED=false CHANGED=false
FAILED=false
mapfile -t _all_modules < <(for d in "$PATCHES_DIR"/*/; do [[ -d "$d" ]] && basename "$d"; done) mapfile -t _all_modules < <(for d in "$PATCHES_DIR"/*/; do [[ -d "$d" ]] && basename "$d"; done)
_target_modules=("${@:-${_all_modules[@]}}") _target_modules=("${@:-${_all_modules[@]}}")
@ -90,9 +91,13 @@ for mod in "${_target_modules[@]}"; do
patch_name="${patches[$i]}" patch_name="${patches[$i]}"
patch_file="$mod_dir/$patch_name" patch_file="$mod_dir/$patch_name"
[[ -f "$patch_file" ]] || continue [[ -f "$patch_file" ]] || continue
if revert_one_patch "$patch_file"; then revert_one_patch "$patch_file"
rc=$?
if [[ "$rc" -eq 0 ]]; then
info " reverted $patch_name" info " reverted $patch_name"
CHANGED=true CHANGED=true
elif [[ "$rc" -eq 2 ]]; then
FAILED=true
fi fi
done done
done done
@ -101,4 +106,6 @@ if [[ "$CHANGED" == "true" ]]; then
info "Restarting pveproxy..." info "Restarting pveproxy..."
systemctl restart pveproxy 2>/dev/null || true systemctl restart pveproxy 2>/dev/null || true
fi fi
[[ "$FAILED" == "false" ]] || exit 1
exit 0 exit 0