From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 328571FF17C for ; Wed, 23 Jul 2025 17:48:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0756F17BD6; Wed, 23 Jul 2025 17:49:44 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Wed, 23 Jul 2025 17:49:34 +0200 Message-Id: <20250723154934.928349-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753285769039 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [frr.pm, sdn.pm] Subject: [pve-devel] [PATCH network] frr: early exit on apply when frr is not installed X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" When frr isn't installed (happens e.g. on pve8 to 9 update) then the SDN and Networking "Apply Configuration" task will throw an error because it can't access the frr daemons file to check if the daemons are enabled. In order to fix this, check if the frr config file exists before continuing with the frr config generation. Also make the "daemons file does not exist" error nicer. Signed-off-by: Gabriel Goller --- src/PVE/Network/SDN.pm | 5 +++++ src/PVE/Network/SDN/Frr.pm | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index 66665a409305..d2ba31283a57 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -355,6 +355,11 @@ sub get_frr_daemon_status { sub generate_frr_config { my ($apply) = @_; + if (!-e $PVE::Network::SDN::Frr::FRR_CONFIG_FILE) { + print "frr is not installed, not generating any frr configuration\n"; + return; + } + my $running_config = PVE::Network::SDN::running_config(); my $fabric_config = PVE::Network::SDN::Fabrics::config(1); diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 52fa456e2181..451ce1d87212 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -44,7 +44,7 @@ sub read_local_frr_config { } } -my $FRR_CONFIG_FILE = "/etc/frr/frr.conf"; +our $FRR_CONFIG_FILE = "/etc/frr/frr.conf"; =head3 apply() @@ -130,7 +130,7 @@ sub set_daemon_status { my ($daemon_status, $set_default) = @_; my $daemons_file = "/etc/frr/daemons"; - die "daemons file does not exist" if !-e $daemons_file; + die "/etc/frr/daemons file does not exist; is the frr package installed?\n" if !-e $daemons_file; for my $daemon (keys %$daemon_status) { die "$daemon is not SDN managed" if !defined $SDN_DAEMONS_DEFAULT->{$daemon}; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel