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

add 'noerr' parameter to parse_tap_devive_name()

Browse Source 
And simply ignore devices with random names in cleanup_firewall_bridge().
This commit is contained in:
Dietmar Maurer 2014-05-16 11:14:47 +02:00
parent f193aa7403
commit 6c80e6d615
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/PVE/Network.pm
View File

@ -66,7 +66,7 @@ my $read_bridge_mtu = sub {
};
my $parse_tap_devive_name = sub {
my ($iface) = @_;
my ($iface, $noerr) = @_;
my ($vmid, $devid);
@ -77,7 +77,8 @@ my $parse_tap_devive_name = sub {
$vmid = $1;
$devid = $2;
} else {
die "wrong interface name $iface";
return undef if $noerr;
die "can't create firewall bridge for random interface name '$iface'\n";
}
return ($vmid, $devid);
@ -193,7 +194,8 @@ my $create_firewall_bridge_ovs = sub {
my $cleanup_firewall_bridge = sub {
my ($iface) = @_;
my ($vmid, $devid) = &$parse_tap_devive_name($iface);
my ($vmid, $devid) = &$parse_tap_devive_name($iface, 1);
return if !defined($vmid);
my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
# cleanup old port config from any openvswitch bridge