half-revert: remove autostart property from bridge ports

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

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 630e62f2f1afe3812d625a4b4c3f4abb68f162a3..60610ce507f467d20d66ea30a4e4ec6a38b1dbf1 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -540,7 +540,7 @@ sub read_etc_resolv_conf {
        chomp $line;
        if ($line =~ m/^(search|domain)\s+(\S+)\s*/) {
            $res->{search} = $2;
-       } elsif ($line =~ m/^nameserver\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s*/) {
+       } elsif ($line =~ m/^\s*nameserver\s+($PVE::Tools::IPRE)\s*/) {
            $nscount++;
            if ($nscount <= 3) {
                $res->{"dns$nscount"} = $1;
@@ -827,7 +827,7 @@ sub __read_etc_network_interfaces {
            my $f = { method => $3 }; # by family, merged to $d with a $suffix
            (my $suffix = $family) =~ s/^inet//;
 
-           my $d = $ifaces->{$i};
+           my $d = $ifaces->{$i} ||= {};
            $d->{priority} = $priority++ if !$d->{priority};
            push @{$d->{families}}, $family;
 
@@ -874,6 +874,8 @@ sub __read_etc_network_interfaces {
                        }
                    } elsif ($id eq 'bridge_fd') {
                        $d->{$id} = $value;
+                   } elsif ($id eq 'bridge_vlan_aware') {
+                       $d->{$id} = 1;
                    } elsif ($id eq 'bond_miimon') {
                        $d->{$id} = $value;
                    } elsif ($id eq 'bond_xmit_hash_policy') {
@@ -959,6 +961,14 @@ sub __read_etc_network_interfaces {
                $ifaces->{$1}->{exists} = 0;
                $d->{exists} = 0;
            }
+       } elsif ($iface =~ m/^(\S+)\.\d+$/) {
+           $d->{type} = 'vlan';
+           if (defined ($ifaces->{$1})) {
+               $d->{exists} = $ifaces->{$1}->{exists};
+           } else {
+               $ifaces->{$1}->{exists} = 0;
+               $d->{exists} = 0;
+           }
        } elsif ($iface =~ m/^eth\d+$/) {
            if (!$d->{ovs_type}) {
                $d->{type} = 'eth';
@@ -996,6 +1006,30 @@ sub __read_etc_network_interfaces {
        close ($proc_net_if_inet6);
     }
 
+    # OVS bridges create "allow-$BRIDGE $IFACE" lines which we need to remove
+    # from the {options} hash for them to be removed correctly.
+    @$options = grep {defined($_)} map {
+       my ($pri, $line) = @$_;
+       if ($line =~ /^allow-(\S+)\s+(.*)$/) {
+           my $bridge = $1;
+           my @ports = split(/\s+/, $2);
+           if (defined(my $br = $ifaces->{$bridge})) {
+               # if this port is part of a bridge, remove it
+               my %in_ovs_ports = map {$_=>1} split(/\s+/, $br->{ovs_ports});
+               @ports = grep { not $in_ovs_ports{$_} } @ports;
+           }
+           # create the allow line for the remaining ports, or delete if empty
+           if (@ports) {
+               [$pri, "allow-$bridge " . join(' ', @ports)];
+           } else {
+               undef;
+           }
+       } else {
+           # don't modify other lines
+           $_;
+       }
+    } @$options;
+
     return $config;
 }
 
@@ -1035,6 +1069,11 @@ sub __interface_to_string {
        $v = defined($d->{bridge_fd}) ? $d->{bridge_fd} : 0;
        $raw .= "\tbridge_fd $v\n";
        $done->{bridge_fd} = 1;
+
+       if( defined($d->{bridge_vlan_aware})) {
+           $raw .= "\tbridge_vlan_aware yes\n";
+       }
+       $done->{bridge_vlan_aware} = 1;
     
     } elsif ($d->{type} eq 'bond') {
 
@@ -1166,7 +1205,14 @@ sub __write_etc_network_interfaces {
            $d->{type} eq 'OVSBond') {
            my $brname = $used_ports->{$iface};
            if (!$brname || !$ifaces->{$brname}) { 
-               delete $ifaces->{$iface}; 
+               if ($iface =~ /^eth/) {
+                   $ifaces->{$iface} = { type => 'eth',
+                                         exists => 1,
+                                         method => 'manual',
+                                         families => ['inet'] };
+               } else {
+                   delete $ifaces->{$iface};
+               }
                next;
            }
            my $bd = $ifaces->{$brname};
@@ -1185,6 +1231,7 @@ sub __write_etc_network_interfaces {
                my $n = $ifaces->{$p};
                die "OVS bridge '$iface' - unable to find port '$p'\n"
                    if !$n;
+               $n->{autostart} = 0;
                if ($n->{type} eq 'eth') {
                    $n->{type} = 'OVSPort';
                    $n->{ovs_bridge} = $iface;              
@@ -1229,60 +1276,60 @@ NETWORKDOC
     my $printed = {};
 
     my $if_type_hash = {
-       unknown => 0,
-       loopback => 10,
-       eth => 20,
-       bond => 30,
-       bridge => 40,
+       loopback => 100000,
+       eth => 200000,
+       bond => 300000,
+       bridge => 400000,
    };
 
     my $lookup_type_prio = sub {
        my $iface = shift;
 
-       my $alias = 0;
-       if ($iface =~ m/^(\S+):\d+$/) {
+       my $child = 0;
+       if ($iface =~ m/^(\S+)(\.|:)\d+$/) {
            $iface = $1;
-           $alias = 1;
+           $child = 1;
        }
 
        my $pri;
        if ($iface eq 'lo') {
            $pri = $if_type_hash->{loopback};
        } elsif ($iface =~ m/^eth\d+$/) {
-           $pri = $if_type_hash->{eth} + $alias;
+           $pri = $if_type_hash->{eth} + $child;
        } elsif ($iface =~ m/^bond\d+$/) {
-           $pri = $if_type_hash->{bond} + $alias;
+           $pri = $if_type_hash->{bond} + $child;
        } elsif ($iface =~ m/^vmbr\d+$/) {
-           $pri = $if_type_hash->{bridge} + $alias;
+           $pri = $if_type_hash->{bridge} + $child;
        }
 
-       return $pri || ($if_type_hash->{unknown} + $alias);
+       return $pri;
     };
 
     foreach my $iface (sort {
        my $ref1 = $ifaces->{$a};
        my $ref2 = $ifaces->{$b};
-       my $p1 = &$lookup_type_prio($a);
-       my $p2 = &$lookup_type_prio($b);
+       my $tp1 = &$lookup_type_prio($a);
+       my $tp2 = &$lookup_type_prio($b);
 
-       return $p1 <=> $p2 if $p1 != $p2;
+       # Only recognized types are in relation to each other. If one type
+       # is unknown then only consider the interfaces' priority attributes.
+       $tp1 = $tp2 = 0 if !defined($tp1) || !defined($tp2);
 
-       $p1 = $ref1->{priority} || 100000;
-       $p2 = $ref2->{priority} || 100000;
+       my $p1 = $tp1 + ($ref1->{priority} // 50000);
+       my $p2 = $tp2 + ($ref2->{priority} // 50000);
 
        return $p1 <=> $p2 if $p1 != $p2;
 
        return $a cmp $b;
-                      } keys %$ifaces) {
-
-       my $d = $ifaces->{$iface};
-
+    } keys %$ifaces) {
        next if $printed->{$iface};
 
-       if (@options && $options[0]->[0] < $d->{priority}) {
+       my $d = $ifaces->{$iface};
+       my $pri = $d->{priority} // 0;
+       if (@options && $options[0]->[0] < $pri) {
            do {
                $raw .= (shift @options)->[1] . "\n";
-           } while (@options && $options[0]->[0] < $d->{priority});
+           } while (@options && $options[0]->[0] < $pri);
            $raw .= "\n";
        }