swap raw syscall numbers with syscall.ph for easier porting

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

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index a15b27df6fe0e0a6d63de58f0c48eb85bd4d017b..b2a580294a9195d8fb313950186a345a4f32b1c2 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -15,7 +15,7 @@ use PVE::SafeSyslog;
 use PVE::Exception qw(raise_param_exc);
 use PVE::Tools;
 use PVE::ProcFSTools;
-use Storable qw(dclone);            
+use Clone qw(clone);
 use Linux::Inotify2;
 use base 'Exporter';
 use JSON; 
@@ -247,7 +247,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};
        }
@@ -269,7 +269,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 +278,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};
     }
@@ -1054,6 +1054,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 +1074,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 +1203,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 =~ /^(?:eth|en|ib)/) {
                    $ifaces->{$iface} = { type => 'eth',
                                          exists => 1,
                                          method => 'manual',
@@ -1290,7 +1292,7 @@ NETWORKDOC
        my $pri;
        if ($iface eq 'lo') {
            $pri = $if_type_hash->{loopback};
-       } elsif ($iface =~ m/^(?:eth\d+|en[^:.]+)$/) {
+       } elsif ($iface =~ m/^(?:eth\d+|ib\d+|en[^:.]+)$/) {
            $pri = $if_type_hash->{eth} + $child;
        } elsif ($iface =~ m/^bond\d+$/) {
            $pri = $if_type_hash->{bond} + $child;