Fix #132: hold a lock while setting up vlan bridges

[pve-common.git] / src / PVE / INotify.pm

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 74a0fe1abf1e30d83a96998ca5b3c433f4779b71..7fb3490c452862770dcb07c7eb70e12d079444ef 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -14,6 +14,7 @@ use Fcntl qw(:DEFAULT :flock);
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise_param_exc);
 use PVE::Tools;
+use PVE::ProcFSTools;
 use Storable qw(dclone);            
 use Linux::Inotify2;
 use base 'Exporter';
@@ -340,7 +341,7 @@ sub register_file {
 sub register_regex {
     my ($dir, $regex, $parser, $writer, $update, %options) = @_;
 
-    die "can't register regex after initify_init" if $inotify;
+    die "can't register regex after inotify_init" if $inotify;
 
     my $uid = "$dir/$regex";
     die "regular expression '$uid' already added :ERROR" if defined ($ccacheregex->{$uid});
@@ -665,7 +666,7 @@ register_file('active', "/var/log/pve/tasks/active",
              \&write_active_workers);
 
 
-my $bond_modes = { 'balance-rr' => 0,
+our $bond_modes = { 'balance-rr' => 0,
                   'active-backup' => 1,
                   'balance-xor' => 2,
                   'broadcast' => 3,
@@ -785,7 +786,7 @@ my $extract_ovs_option = sub {
 sub read_etc_network_interfaces {
     my ($filename, $fh) = @_;
     my $proc_net_dev = IO::File->new('/proc/net/dev', 'r');
-    my $active = PVE::Network::get_active_interfaces();
+    my $active = PVE::ProcFSTools::get_active_network_interfaces();
     return __read_etc_network_interfaces($fh, $proc_net_dev, $active);
 }
 
@@ -800,7 +801,7 @@ sub __read_etc_network_interfaces {
 
     if ($proc_net_dev) {
        while (defined ($line = <$proc_net_dev>)) {
-           if ($line =~ m/^\s*(eth\d+):.*/) {
+           if ($line =~ m/^\s*(eth\d+|en[^:.]+):.*/) {
                $ifaces->{$1}->{exists} = 1;
            }
        }
@@ -973,7 +974,7 @@ sub __read_etc_network_interfaces {
                $ifaces->{$1}->{exists} = 0;
                $d->{exists} = 0;
            }
-       } elsif ($iface =~ m/^eth\d+$/) {
+       } elsif ($iface =~ m/^(?:eth\d+|en[^:.]+)$/) {
            if (!$d->{ovs_type}) {
                $d->{type} = 'eth';
            } elsif ($d->{ovs_type} eq 'OVSPort') {
@@ -1200,7 +1201,7 @@ sub __write_etc_network_interfaces {
            $d->{type} eq 'OVSBond') {
            my $brname = $used_ports->{$iface};
            if (!$brname || !$ifaces->{$brname}) { 
-               if ($iface =~ /^eth/) {
+               if ($iface =~ /^(?:eth|en)/) {
                    $ifaces->{$iface} = { type => 'eth',
                                          exists => 1,
                                          method => 'manual',
@@ -1289,7 +1290,7 @@ NETWORKDOC
        my $pri;
        if ($iface eq 'lo') {
            $pri = $if_type_hash->{loopback};
-       } elsif ($iface =~ m/^eth\d+$/) {
+       } elsif ($iface =~ m/^(?:eth\d+|en[^:.]+)$/) {
            $pri = $if_type_hash->{eth} + $child;
        } elsif ($iface =~ m/^bond\d+$/) {
            $pri = $if_type_hash->{bond} + $child;