From 552a5c071b0757979b297e57d823ddd04fa8cb4b Mon Sep 17 00:00:00 2001
From: Meliox <5264368+Meliox@users.noreply.github.com>
Date: Sat, 8 Aug 2026 22:23:25 +0200
Subject: [PATCH] fix: write config before applying patches so pveproxy
 restarts with new settings (#248)

* fix: write config before applying patches so pveproxy restarts with new settings

* write config per mod only

---------

Co-authored-by: Meliox <na>
---
 src/Scripts/pve-mod-configure | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Scripts/pve-mod-configure b/src/Scripts/pve-mod-configure
index c251ba6..37046ed 100644
--- a/src/Scripts/pve-mod-configure
+++ b/src/Scripts/pve-mod-configure
@@ -137,6 +137,8 @@ main() {
                 msgb "\n=== Node Info Configuration ==="
                 node_info_configure
             fi
+            # Write before patching so pveproxy restarts with the new config.
+            write_main_conf; node_info_write_conf
             ;;
         2)
             selected_mod="nag_screen"
@@ -147,6 +149,8 @@ main() {
                 info "Subscription nag screen removal will be applied."
                 nag_screen_configure
             fi
+            # Write before patching so pveproxy restarts with the new config.
+            write_main_conf; nag_screen_write_conf
             ;;
         3)
             if [[ "$PVE_TRIGGER_ENABLED" == "1" ]]; then
@@ -154,28 +158,25 @@ main() {
             else
                 PVE_TRIGGER_ENABLED=1; info "Auto re-patching on PVE upgrade enabled."
             fi
+            write_main_conf  # no patches for this option
             ;;
         [nN]) info "No option selected. Exiting."; exit 0 ;;
         *)    warn "Invalid selection. Exiting."; exit 0 ;;
     esac
 
-    # ── Write config and apply/revert ─────────────────────────────────────────
-    # For mods with patches: apply if being enabled, revert if being disabled.
-    # Option 3 (pve_trigger) has no patches — write_main_conf is sufficient.
+    # ── Apply / revert patches ────────────────────────────────────────────────
+    # Config is already written above; pveproxy will restart with new settings.
     if [[ "$patching_needed" == "1" ]]; then
         msgb "\n=== Applying patches ==="
         if ! "$APPLY_PATCHES" "$selected_mod"; then
-            err "Could not apply all patches for $selected_mod. Configuration was not updated."
+            err "Could not apply all patches for $selected_mod."
         fi
     elif [[ -n "$selected_mod" ]]; then
         msgb "\n=== Removing patches ==="
         if ! "$REVERT_PATCHES" "$selected_mod"; then
-            err "Could not revert all patches for $selected_mod. Configuration was not updated."
+            err "Could not revert all patches for $selected_mod."
         fi
     fi
-    write_main_conf
-    node_info_write_conf
-    nag_screen_write_conf
 
     msgb "\n=== Done ==="
     info "pve-mod is configured and active."