From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BE5CD1FF13C for ; Thu, 19 Feb 2026 13:16:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 24E0913648; Thu, 19 Feb 2026 13:17:59 +0100 (CET) Message-ID: Date: Thu, 19 Feb 2026 13:17:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox-ve-rs 7/9] frr: support custom frr configuration lines To: Gabriel Goller , pve-devel@lists.proxmox.com References: <20260203160246.353351-1-g.goller@proxmox.com> <20260203160246.353351-8-g.goller@proxmox.com> Content-Language: en-US From: Hannes Laimer In-Reply-To: <20260203160246.353351-8-g.goller@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1771503434589 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.060 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: O56CEWHNKD3PANK6OOL3TXHBONWHKIUJ X-Message-ID-Hash: O56CEWHNKD3PANK6OOL3TXHBONWHKIUJ X-MailFrom: h.laimer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: currently we place the custom stuff from `frr.conf.local` at the top of `frr.conf`. I don't think it should be a problem having it at the bottom, but I'm not super sure if there maybe exist some options we don't merge that care about the ordering. I couldn't find any, but in case I missed something, wanted to note it here. On 2026-02-03 17:01, Gabriel Goller wrote: > When merging the frr.conf.local with the frr.conf, some lines cannot be > merged and we need to add custom frr config lines to the rust > configuration. Add the vec of lines and just dump them into the > template. > > Co-authored-by: Stefan Hanreich > Signed-off-by: Gabriel Goller > --- > proxmox-frr-templates/templates/frr.conf.jinja | 3 +++ > proxmox-frr/src/ser/mod.rs | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/proxmox-frr-templates/templates/frr.conf.jinja b/proxmox-frr-templates/templates/frr.conf.jinja > index c8495b417990..6d60ad2a4c4c 100644 > --- a/proxmox-frr-templates/templates/frr.conf.jinja > +++ b/proxmox-frr-templates/templates/frr.conf.jinja > @@ -4,3 +4,6 @@ > {% include "access_lists.jinja" %} > {% include "route_maps.jinja" %} > {% include "protocol_routemaps.jinja" %} > +{% for line in custom_frr_config %} > +{{ line }} > +{% endfor %} > diff --git a/proxmox-frr/src/ser/mod.rs b/proxmox-frr/src/ser/mod.rs > index 9aaee74d7af0..3baa0a318fb0 100644 > --- a/proxmox-frr/src/ser/mod.rs > +++ b/proxmox-frr/src/ser/mod.rs > @@ -185,6 +185,9 @@ pub struct FrrConfig { > #[builder(default)] > #[serde(default)] > pub access_lists: BTreeMap>, > + #[builder(default)] > + #[serde(default)] > + pub custom_frr_config: Vec, > } > > #[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)]