From f48815f8b60163381a99c42be0f8e554a53d2677 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Fri, 20 Sep 2019 16:29:53 +0200 Subject: [PATCH] etc_network_interfaces : handle autostart for ovs Signed-off-by: Alexandre Derumier --- src/PVE/INotify.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index 65b2d91..e224f78 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -902,8 +902,8 @@ sub __read_etc_network_interfaces { chomp ($line); next if $line =~ m/^\s*#/; - if ($line =~ m/^\s*auto\s+(.*)$/) { - my @aa = split (/\s+/, $1); + if ($line =~ m/^\s*(auto|allow-ovs)\s+(.*)$/) { + my @aa = split (/\s+/, $2); foreach my $a (@aa) { $ifaces->{$a}->{autostart} = 1; @@ -1599,11 +1599,13 @@ NETWORKDOC } $printed->{$iface} = 1; - if ($d->{type} eq 'OVSBridge') { - # cannot use 'auto' for OVS, would add race with systemd ifup@.service - $raw .= "allow-ovs $iface\n"; - } elsif ($d->{autostart}) { - $raw .= "auto $iface\n"; + if ($d->{autostart}) { + if ($d->{type} eq 'OVSBridge') { + # cannot use 'auto' for OVS, would add race with systemd ifup@.service + $raw .= "allow-ovs $iface\n"; + } else { + $raw .= "auto $iface\n"; + } } my $i = 0; # some options should be printed only once -- 2.39.2