add and use physical NIC regexp

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index b2a580294a9195d8fb313950186a345a4f32b1c2..a383040e6ade2d31770568953772c66b814d0519 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -13,6 +13,7 @@ use File::Basename;
 use Fcntl qw(:DEFAULT :flock);
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise_param_exc);
 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 Clone qw(clone);
 use PVE::Tools;
 use PVE::ProcFSTools;
 use Clone qw(clone);


@@ -801,7 +802,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+|en[^:.]+|ib\d+):.*/) {
+           if ($line =~ m/^\s*($PVE::Network::PHYSICAL_NIC_RE):.*/) {

                $ifaces->{$1}->{exists} = 1;
            }
        }
                $ifaces->{$1}->{exists} = 1;
            }
        }


@@ -974,7 +975,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+|en[^:.]+|ib\d+)$/) {
+       } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {

            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') {


@@ -1203,7 +1204,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|en|ib)/) {
+               if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {

                    $ifaces->{$iface} = { type => 'eth',
                                          exists => 1,
                                          method => 'manual',
                    $ifaces->{$iface} = { type => 'eth',
                                          exists => 1,
                                          method => 'manual',


@@ -1292,7 +1293,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+|ib\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;
            $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 a659a5c4a4f5a31ec66e2ca64ebaa7783aed4d9f..627e7647050c3b97ad3c444c98941437a770c848 100644 (file)
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -14,6 +14,8 @@ use Net::IP;
 
 # host network related utility functions
 
 
 # host network related utility functions
 

+our $PHYSICAL_NIC_RE = qr/(?:eth\d+|en[^:.]+|ib\d+)/;
+

 our $ipv4_reverse_mask = [
     '0.0.0.0',
     '128.0.0.0',
 our $ipv4_reverse_mask = [
     '0.0.0.0',
     '128.0.0.0',