Merge pull request #4227 from c-po/T6746-frr-10

frr: upgrade to 10.2 and migrate protocols to unified FRRender class

3 files changed, 8 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index a19461412..76ca83dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -166,7 +166,7 @@ Depends:
   sstp-client,
 # End "interfaces sstpc"
 # For "protocols *"
-  frr (>= 9.1),
+  frr (>= 10.2),
   frr-pythontools,
   frr-rpki-rtrlib,
   frr-snmp,
diff --git a/debian/rules b/debian/rules
index c15fcab11..d7c427b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,6 +94,8 @@ override_dh_auto_install:
 	cp -r data/reftree.cache $(DIR)/$(VYCONF_CONFIG_DIR)
 	mkdir -p $(DIR)/$(VYOS_DATA_DIR)
 	cp -r data/* $(DIR)/$(VYOS_DATA_DIR)
+	# Remove j2lint comments / linter configuration which would insert additional new-lines
+	find $(DIR)/$(VYOS_DATA_DIR) -name "*.j2" -type f | xargs sed -i -e '/^{#.*#}/d'
 
 	# Create localui dir
 	mkdir -p $(DIR)/$(VYOS_LOCALUI_DIR)
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index d83634cfc..ff5a91e09 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -267,3 +267,8 @@ fi
 
 # T4287 - as we have a non-signed kernel use the upstream wireless reulatory database
 update-alternatives --set regulatory.db /lib/firmware/regulatory.db-upstream
+
+# Restart vyos-configd to apply changes in Python scripts/templates
+if systemctl is-active --quiet vyos-configd; then
+    systemctl restart vyos-configd
+fi