And simply ignore devices with random names in cleanup_firewall_bridge().
};
my $parse_tap_devive_name = sub {
};
my $parse_tap_devive_name = sub {
+ my ($iface, $noerr) = @_;
$vmid = $1;
$devid = $2;
} else {
$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);
}
return ($vmid, $devid);
my $cleanup_firewall_bridge = sub {
my ($iface) = @_;
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
my ($fwbr, $vethfw, $vethfwpeer, $ovsintport) = &$compute_fwbr_names($vmid, $devid);
# cleanup old port config from any openvswitch bridge