support for predictable network interface device names

Based on patch from: Igor Vlasenko <viy@altlinux.org>

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 74a0fe1abf1e30d83a96998ca5b3c433f4779b71..c34659fc843a1263565bb7dd587885ff57d7bc71 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -800,7 +800,7 @@ sub __read_etc_network_interfaces {
 
     if ($proc_net_dev) {
        while (defined ($line = <$proc_net_dev>)) {
 
     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;
            }
        }
                $ifaces->{$1}->{exists} = 1;
            }
        }


@@ -973,7 +973,7 @@ sub __read_etc_network_interfaces {
                $ifaces->{$1}->{exists} = 0;
                $d->{exists} = 0;
            }
                $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') {
            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}) { 
            $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',
                    $ifaces->{$iface} = { type => 'eth',
                                          exists => 1,
                                          method => 'manual',


@@ -1289,7 +1289,7 @@ NETWORKDOC
        my $pri;
        if ($iface eq 'lo') {
            $pri = $if_type_hash->{loopback};
        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;
            $pri = $if_type_hash->{eth} + $child;
        } elsif ($iface =~ m/^bond\d+$/) {
            $pri = $if_type_hash->{bond} + $child;

diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
index be2613298b73358e229ac581638c18e4f5a4ccdb..0a984ad32f9e51bc0ab145c073253991edb5dcf1 100644 (file)
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -440,7 +440,7 @@ sub activate_bridge_vlan {
 
     my @ifaces = ();
     my $dir = "/sys/class/net/$bridge/brif";
 
     my @ifaces = ();
     my $dir = "/sys/class/net/$bridge/brif";

-    PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+(\.\d+)?)', sub {
+    PVE::Tools::dir_glob_foreach($dir, '(((eth|bond)\d+|en[^.]+)(\.\d+)?)', sub {

         push @ifaces, $_[0];
     });
 
         push @ifaces, $_[0];
     });