public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-network 08/10] debian: handle user modifications to FRR templates via ucf
Date: Tue,  3 Feb 2026 17:01:26 +0100	[thread overview]
Message-ID: <20260203160246.353351-20-g.goller@proxmox.com> (raw)
In-Reply-To: <20260203160246.353351-1-g.goller@proxmox.com>

This ensures that user customizations to frr jinja templates in
/etc/proxmox-frr/templates/ are preserved across package updates through
ucf's three-way merge, preventing silent overwrites of local changes.
When a user has customized a template and updates this package which
ships a new template version, ucf shows a three-way merge dialog
(ncurses) allowing them to view the differences and choose between the
maintainer's version, their version, or manually edit the merge result.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
 debian/control                      |  1 +
 debian/libpve-network-perl.postinst | 34 ++++++++++++++++++++++++++++-
 debian/libpve-network-perl.postrm   | 33 ++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 debian/libpve-network-perl.postrm

diff --git a/debian/control b/debian/control
index 6fe98822e64c..83ddfc053048 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends: libpve-common-perl (>= 9.1.1),
          libnetaddr-ip-perl,
          libpve-rs-perl (>= 0.11.1),
          libuuid-perl,
+         ucf,
          ${misc:Depends},
          ${perl:Depends},
 Recommends: frr-pythontools (>= 10.3.1-1+pve2~),
diff --git a/debian/libpve-network-perl.postinst b/debian/libpve-network-perl.postinst
index 99faedf48f56..629c5bdc9e18 100644
--- a/debian/libpve-network-perl.postinst
+++ b/debian/libpve-network-perl.postinst
@@ -2,6 +2,36 @@
 
 set -e
 
+TEMPLATE_OVERRIDE_DIR="/etc/proxmox-frr/templates"
+
+update_override_frr_templates() {
+  for override_file in "$TEMPLATE_OVERRIDE_DIR"/*; do
+    # only consider files ending in .jinja. we often have .ucf-old files as
+    # well storing the previous ucf decision.
+    case "$override_file" in
+      *.jinja)
+        ;;
+      *)
+        continue
+        ;;
+    esac
+
+    filename=$(basename "$override_file")
+
+    temp_packaged_file=$(mktemp)
+
+    # we want to embed the variable now, not when the trap is executed
+    # shellcheck disable=SC2064
+    trap "rm -f -- '$temp_packaged_file'" EXIT
+
+    if pvesdn template show "$filename" > "$temp_packaged_file"; then
+      ucf --three-way --debconf-ok "$temp_packaged_file" "$override_file"
+    fi
+
+    ucfr libpve-network-perl "$override_file"
+  done
+}
+
 migrate_ipam_db() {
   LEGACY_IPAM_DB_FILE="/etc/pve/priv/ipam.db"
   IPAM_DB_FILE="/etc/pve/sdn/pve-ipam-state.json"
@@ -29,7 +59,9 @@ case "$1" in
       migrate_ipam_db
       migrate_mac_cache
     fi
-  ;;
+
+    update_override_frr_templates
+    ;;
 esac
 
 exit 0
diff --git a/debian/libpve-network-perl.postrm b/debian/libpve-network-perl.postrm
new file mode 100644
index 000000000000..5a1c6834111b
--- /dev/null
+++ b/debian/libpve-network-perl.postrm
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+TEMPLATE_OVERRIDE_DIR="/etc/proxmox-frr/templates"
+
+case "$1" in
+    purge)
+        # Remove ucf registrations on purge
+        if [ -d "$TEMPLATE_OVERRIDE_DIR" ]; then
+            for package_file in "$TEMPLATE_OVERRIDE_DIR"/*; do
+                [ -e "$package_file" ] || continue
+
+                filename=$(basename "$package_file")
+                target_file="$TEMPLATE_OVERRIDE_DIR/$filename"
+
+                ucf --purge "$target_file" 2>/dev/null || true
+                ucfr --purge libpve-network-perl "$target_file" 2>/dev/null || true
+            done
+        fi
+        ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
-- 
2.47.3





  parent reply	other threads:[~2026-02-03 16:05 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-03 16:01 [PATCH docs/manager/network/proxmox{-ve-rs,-perl-rs} 00/23] Generate frr config using jinja templates and rust types Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 1/9] ve-config: firewall: cargo fmt Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 2/9] frr: add proxmox-frr-templates package that contains templates Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 3/9] ve-config: remove FrrConfigBuilder struct Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 4/9] sdn-types: support variable-length NET identifier Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 5/9] frr: add template serializer and serialize fabrics using templates Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 6/9] frr: add isis configuration and templates Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 7/9] frr: support custom frr configuration lines Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 8/9] frr: add bgp support with templates and serialization Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 9/9] frr: store frr template content as a const map Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-perl-rs 1/2] sdn: add function to generate the frr config for all daemons Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-perl-rs 2/2] sdn: add method to get a frr template Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 01/10] sdn: remove duplicate comment line '!' in frr config Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 02/10] sdn: tests: add missing comment " Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 03/10] tests: use Test::Differences to make test assertions Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 04/10] sdn: write structured frr config that can be rendered using templates Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 05/10] tests: rearrange some statements in the frr config Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 06/10] sdn: adjust frr.conf.local merging to rust template types Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 07/10] cli: add pvesdn cli tool for managing frr template overrides Gabriel Goller
2026-02-03 16:01 ` Gabriel Goller [this message]
2026-02-03 16:01 ` [PATCH pve-network 09/10] api: add dry-run endpoint for sdn apply to preview changes Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 10/10] test: add test for frr.conf.local merging Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-manager 1/1] sdn: add dry-run view for sdn apply Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-docs 1/1] docs: add man page for the `pvesdn` cli Gabriel Goller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260203160246.353351-20-g.goller@proxmox.com \
    --to=g.goller@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal