X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;h=445c0348699c26d46deec51b8bba9baca9ac950b;hb=0ed806982c267da93e3c68adabef96b9a69eb117;hp=7fb3490c452862770dcb07c7eb70e12d079444ef;hpb=f0d1b04fdad02d1a7348f1396d20003224690055;p=pve-common.git

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 7fb3490..445c034 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -13,9 +13,10 @@ use File::Basename;
 use Fcntl qw(:DEFAULT :flock);
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise_param_exc);
+use PVE::Network;
 use PVE::Tools;
 use PVE::ProcFSTools;
-use Storable qw(dclone);            
+use Clone qw(clone);
 use Linux::Inotify2;
 use base 'Exporter';
 use JSON; 
@@ -198,6 +199,16 @@ sub discard_changes {
     return read_file ($filename, $full);
 }
 
+sub poll_changes {
+    my ($filename) = @_;
+
+    poll() if $inotify; # read new inotify events
+
+    $versions->{$filename} = 0 if !defined ($versions->{$filename});
+
+    return $versions->{$filename};
+}
+
 sub read_file {
     my ($fileid, $full) = @_;
 
@@ -210,11 +221,7 @@ sub read_file {
     my $fd;
     my $shadow;
 
-    poll() if $inotify; # read new inotify events
-
-    $versions->{$filename} = 0 if !defined ($versions->{$filename});
-
-    my $cver = $versions->{$filename};
+    my $cver = poll_changes($filename);
 
     if (my $copy = $shadowfiles->{$filename}) {
 	if ($fd = IO::File->new ($copy, "r")) {
@@ -239,15 +246,15 @@ sub read_file {
 
     # file unchanged?
     if (!$ccinfo->{nocache} &&
-	$inotify && $versions->{$filename} &&
+	$inotify && $cver &&
 	defined ($ccinfo->{data}) &&
 	defined ($ccinfo->{version}) &&
 	($ccinfo->{readonce} ||
-	 ($ccinfo->{version} == $versions->{$filename}))) {
+	 ($ccinfo->{version} == $cver))) {
 
 	my $ret;
 	if (!$noclone && ref ($ccinfo->{data})) {
-	    $ret->{data} = dclone ($ccinfo->{data});
+	    $ret->{data} = clone ($ccinfo->{data});
 	} else {
 	    $ret->{data} = $ccinfo->{data};
 	}
@@ -269,7 +276,7 @@ sub read_file {
     }
 
     # we cache data with references, so we always need to
-    # dclone this data. Else the original data may get
+    # clone this data. Else the original data may get
     # modified.
     $ccinfo->{data} = $res;
 
@@ -278,7 +285,7 @@ sub read_file {
 
     my $ret;
     if (!$noclone && ref ($ccinfo->{data})) {
-	$ret->{data} = dclone ($ccinfo->{data});
+	$ret->{data} = clone ($ccinfo->{data});
     } else {
 	$ret->{data} = $ccinfo->{data};
     }
@@ -801,7 +808,7 @@ sub __read_etc_network_interfaces {
 
     if ($proc_net_dev) {
 	while (defined ($line = <$proc_net_dev>)) {
-	    if ($line =~ m/^\s*(eth\d+|en[^:.]+):.*/) {
+	    if ($line =~ m/^\s*($PVE::Network::PHYSICAL_NIC_RE):.*/) {
 		$ifaces->{$1}->{exists} = 1;
 	    }
 	}
@@ -974,7 +981,7 @@ sub __read_etc_network_interfaces {
 		$ifaces->{$1}->{exists} = 0;
 		$d->{exists} = 0;
 	    }
-	} elsif ($iface =~ m/^(?:eth\d+|en[^:.]+)$/) {
+	} elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
 	    if (!$d->{ovs_type}) {
 		$d->{type} = 'eth';
 	    } elsif ($d->{ovs_type} eq 'OVSPort') {
@@ -1054,6 +1061,7 @@ sub __interface_to_string {
 	# not printing out options
     } elsif ($d->{type} eq 'bridge') {
 
+	$d->{bridge_ports} =~ s/[;,\s]+/ /g;
 	my $ports = $d->{bridge_ports} || 'none';
 	$raw .= "\tbridge_ports $ports\n";
 	$done->{bridge_ports} = 1;
@@ -1073,6 +1081,7 @@ sub __interface_to_string {
     
     } elsif ($d->{type} eq 'bond') {
 
+	$d->{slaves} =~ s/[;,\s]+/ /g;
 	my $slaves = $d->{slaves} || 'none';
 	$raw .= "\tslaves $slaves\n";
 	$done->{slaves} = 1;
@@ -1201,7 +1210,7 @@ sub __write_etc_network_interfaces {
 	    $d->{type} eq 'OVSBond') {
 	    my $brname = $used_ports->{$iface};
 	    if (!$brname || !$ifaces->{$brname}) { 
-		if ($iface =~ /^(?:eth|en)/) {
+		if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
 		    $ifaces->{$iface} = { type => 'eth',
 					  exists => 1,
 					  method => 'manual',
@@ -1290,7 +1299,7 @@ NETWORKDOC
 	my $pri;
 	if ($iface eq 'lo') {
 	    $pri = $if_type_hash->{loopback};
-	} elsif ($iface =~ m/^(?:eth\d+|en[^:.]+)$/) {
+	} elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
 	    $pri = $if_type_hash->{eth} + $child;
 	} elsif ($iface =~ m/^bond\d+$/) {
 	    $pri = $if_type_hash->{bond} + $child;