proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-12 12:17:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

network: followup code cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-09-20 09:42:05 +02:00
parent 4ac94c72a2
commit bd9cc42d82
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PVE/INotify.pm
View File

@ -1294,10 +1294,9 @@ sub __interface_to_string {
$raw .= "\tovs_type $d->{type}\n"; $raw .= "\tovs_type $d->{type}\n";
$done->{ovs_type} = 1; $done->{ovs_type} = 1;
if ($d->{ovs_bridge}) { if (my $bridge = $d->{ovs_bridge}) {
$raw = "allow-$bridge $iface\n$raw";
$raw = "allow-$d->{ovs_bridge} $iface\n$raw"; $raw .= "\tovs_bridge $bridge\n";
$raw .= "\tovs_bridge $d->{ovs_bridge}\n";
$done->{ovs_bridge} = 1; $done->{ovs_bridge} = 1;
} }
} }
@ -1600,10 +1599,11 @@ NETWORKDOC
} }
$printed->{$iface} = 1; $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"; $raw .= "allow-ovs $iface\n";
} elsif ($d->{autostart}) { } elsif ($d->{autostart}) {
$raw .= "auto $iface\n" if $d->{autostart}; $raw .= "auto $iface\n";
} }
my $i = 0; # some options should be printed only once my $i = 0; # some options should be printed only once