proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-04-28 15:28:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

inotify: avoid cyclic use statement

Browse Source 
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 <w.bumiller@proxmox.com>
Fixes: e68ebda ("fix #545: interfaces: allow arbitrary bridge names in network config")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2024-08-02 13:53:22 +02:00 committed by Thomas Lamprecht
parent 61073db2bc
commit bbca06d995
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/INotify.pm
View File

@ -22,7 +22,6 @@ use PVE::Network;
use PVE::ProcFSTools; use PVE::ProcFSTools;
use PVE::SafeSyslog; use PVE::SafeSyslog;
use PVE::Tools; use PVE::Tools;
use PVE::RESTEnvironment qw(log_warn);
use base 'Exporter'; 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 # map address and netmask to cidr
if (my $addr = $d->{address}) { if (my $addr = $d->{address}) {
if (_address_is_cidr($addr)) { if (_address_is_cidr($addr)) {