Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2024-12-22 21:33:47 +03:00
Code Releases Activity

Inotify : write network config : remove allow- ovs with ifupdown2

Browse Source
This commit is contained in:
Alexandre Derumier 2018-06-20 07:36:57 +02:00 committed by Wolfgang Bumiller
parent 95d0e63377
commit b7c4f37851
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/PVE/INotify.pm
View File

@ -1053,7 +1053,7 @@ sub __read_etc_network_interfaces {
}
sub __interface_to_string {
my ($iface, $d, $family, $first_block) = @_;
my ($iface, $d, $family, $first_block, $ifupdown2) = @_;
(my $suffix = $family) =~ s/^inet//;
@ -1162,7 +1162,13 @@ sub __interface_to_string {
$done->{ovs_type} = 1;
if ($d->{ovs_bridge}) {
$raw = "allow-$d->{ovs_bridge} $iface\n$raw";
if ($ifupdown2) {
$raw = "auto $iface\n$raw";
} else {
$raw = "allow-$d->{ovs_bridge} $iface\n$raw";
}
$raw .= "\tovs_bridge $d->{ovs_bridge}\n";
$done->{ovs_bridge} = 1;
}
@ -1195,11 +1201,12 @@ sub __interface_to_string {
sub write_etc_network_interfaces {
my ($filename, $fh, $config) = @_;
my $raw = __write_etc_network_interfaces($config);
my $ifupdown2 = -e '/usr/share/ifupdown2';
my $raw = __write_etc_network_interfaces($config, $ifupdown2);
PVE::Tools::safe_print($filename, $fh, $raw);
}
sub __write_etc_network_interfaces {
my ($config) = @_;
my ($config, $ifupdown2) = @_;
my $ifaces = $config->{ifaces};
my @options = @{$config->{options}};
@ -1359,7 +1366,7 @@ NETWORKDOC
$printed->{$iface} = 1;
$raw .= "auto $iface\n" if $d->{autostart};
my $i = 0; # some options should be printed only once
$raw .= __interface_to_string($iface, $d, $_, !$i++) foreach @{$d->{families}};
$raw .= __interface_to_string($iface, $d, $_, !$i++, $ifupdown2) foreach @{$d->{families}};
}
$raw .= $_->[1] . "\n" foreach @options;