From bbca06d9958b25d2d465f7baa855d0a4a26829df Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Fri, 2 Aug 2024 13:53:22 +0200 Subject: [PATCH] inotify: avoid cyclic use statement 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 --- src/PVE/INotify.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index 1b3babd..8725aae 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)) {