From bd9cc42d82ee9402a04af8617d771db6ac5add36 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Fri, 20 Sep 2019 09:42:05 +0200 Subject: [PATCH] network: followup code cleanup Signed-off-by: Thomas Lamprecht --- src/PVE/INotify.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index b3e5ab0..65b2d91 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -1294,10 +1294,9 @@ sub __interface_to_string { $raw .= "\tovs_type $d->{type}\n"; $done->{ovs_type} = 1; - if ($d->{ovs_bridge}) { - - $raw = "allow-$d->{ovs_bridge} $iface\n$raw"; - $raw .= "\tovs_bridge $d->{ovs_bridge}\n"; + if (my $bridge = $d->{ovs_bridge}) { + $raw = "allow-$bridge $iface\n$raw"; + $raw .= "\tovs_bridge $bridge\n"; $done->{ovs_bridge} = 1; } } @@ -1600,10 +1599,11 @@ NETWORKDOC } $printed->{$iface} = 1; - if ($d->{type} eq 'OVSBridge') { + 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}; + $raw .= "auto $iface\n"; } my $i = 0; # some options should be printed only once -- 2.39.2