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

network: cleanup "check bond" code

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-10-23 21:08:38 +02:00
parent 000a5a6bcb
commit 329dfb6488
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/PVE/INotify.pm
View File

@ -1500,21 +1500,21 @@ sub __write_etc_network_interfaces {
# check bond # check bond
foreach my $iface (keys %$ifaces) { foreach my $iface (keys %$ifaces) {
my $d = $ifaces->{$iface}; my $d = $ifaces->{$iface};
if ($d->{type} eq 'bond' && $d->{slaves}) { next if !($d->{type} eq 'bond' && $d->{slaves});
my $bond_primary_is_slave = undef;
foreach my $p (split (/\s+/, $d->{slaves})) {
my $n = $ifaces->{$p};
$n->{autostart} = 1;
die "bond '$iface' - unable to find slave '$p'\n" my $bond_primary_is_slave = undef;
if !$n; foreach my $p (split (/\s+/, $d->{slaves})) {
die "bond '$iface' - wrong interface type on slave '$p' " . my $n = $ifaces->{$p};
"('$n->{type}' != 'eth or bond')\n" if ($n->{type} ne 'eth' && $n->{type} ne 'bond'); $n->{autostart} = 1;
&$check_mtu($ifaces, $iface, $p);
$bond_primary_is_slave = 1 if $d->{'bond-primary'} && $d->{'bond-primary'} eq $p; die "bond '$iface' - unable to find slave '$p'\n" if !$n;
} die "bond '$iface' - wrong interface type on slave '$p' ('$n->{type}' != 'eth or bond')\n"
die "bond '$iface' - bond-primary interface is not a slave" if $d->{'bond-primary'} && !$bond_primary_is_slave; if ($n->{type} ne 'eth' && $n->{type} ne 'bond');
$check_mtu->($ifaces, $iface, $p);
$bond_primary_is_slave = 1 if $d->{'bond-primary'} && $d->{'bond-primary'} eq $p;
} }
die "bond '$iface' - bond-primary interface is not a slave" if $d->{'bond-primary'} && !$bond_primary_is_slave;
} }
# check vxlan # check vxlan