X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;h=8cc00f80df28b0e4e94b846a6d33eb4f3ec3d890;hp=74a0fe1abf1e30d83a96998ca5b3c433f4779b71;hb=c8e5d28e29a932a3729ec3396a0081080041c866;hpb=12a235d624c04795a542703a48f65d6d1a22c474

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 74a0fe1..8cc00f8 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -340,7 +340,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 +665,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,
@@ -800,7 +800,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 +973,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 +1200,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 +1289,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;