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 DE5A01FF17D for ; Fri, 2 Aug 2024 13:53:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B8066B802; Fri, 2 Aug 2024 13:53:59 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 2 Aug 2024 13:53:22 +0200 Message-Id: <20240802115322.71114-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [inotify.pm] Subject: [pve-devel] [PATCH common] inotify: avoid cyclic use statement 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" Commit e68ebda ("fix #545: interfaces: allow arbitrary bridge names in network config") introduced a cyclic usage between PVE::RESTEnvironment and PVE::INotify, making code like the following fail: > perl -e "use PVE::RESTEnvironment qw(log_warn);" Note, including the PVE::INotify module first would still work, i.e.: > perl -e "use PVE::INotify; use PVE::RESTEnvironment qw(log_warn);" The rest of the PVE::INotify module alredy uses syslog(), which could be used here as well to get rid of the cyclic usage. Wolfgang argued that the whole point of commit e68ebda was to remove coupling between the name and the type of the interface. If there still is some code about a name starting with 'vmbr' being classified wrong, that should rather be fixed. Because of the very commit, the frontend already doesn't show e.g. a non-bridge with name 'vmbr7' in bridge selectors. Suggested-by: Wolfgang Bumiller Fixes: e68ebda ("fix #545: interfaces: allow arbitrary bridge names in network config") Signed-off-by: Fiona Ebner --- @Stefan: Do you have any good rationale to rather keep the check? src/PVE/INotify.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index 8a4a810..e7c55f6 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -22,7 +22,6 @@ use PVE::Network; use PVE::ProcFSTools; use PVE::SafeSyslog; use PVE::Tools; -use PVE::RESTEnvironment qw(log_warn); use base 'Exporter'; @@ -1145,9 +1144,6 @@ sub __read_etc_network_interfaces { } } - log_warn("detected a interface $iface that is not a bridge!") - if !($d->{type} eq 'OVSBridge' || $d->{type} eq 'bridge') && $iface =~ m/^vmbr\d+$/; - # map address and netmask to cidr if (my $addr = $d->{address}) { if (_address_is_cidr($addr)) { -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel