X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;fp=src%2FPVE%2FINotify.pm;h=0136f326bb89d93c407f4ad55ed01992a347c609;hp=d3998cde8b2d38835d2196111681d7913544ae06;hb=d34d73932843428b974cdda647de36358fb0f62e;hpb=d31273b42fa145d0df2f78dad863832943047153 diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index d3998cd..0136f32 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -1311,7 +1311,12 @@ sub __interface_to_string { $done->{ovs_type} = 1; if (my $bridge = $d->{ovs_bridge}) { - $raw = "allow-$bridge $iface\n$raw"; + if ($ifupdown2) { + $raw = "auto $iface\n$raw"; + } else { + $raw = "allow-$bridge $iface\n$raw"; + } + $raw .= "\tovs_bridge $bridge\n"; $done->{ovs_bridge} = 1; } @@ -1653,7 +1658,7 @@ NETWORKDOC $printed->{$iface} = 1; if ($d->{autostart}) { - if ($d->{type} eq 'OVSBridge') { + if ($d->{type} eq 'OVSBridge' && !$ifupdown2) { # cannot use 'auto' for OVS, would add race with systemd ifup@.service $raw .= "allow-ovs $iface\n"; } else {