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

Inotify: fix mtu check

- special check for bond, set parent mtu from slaves mtu if no defined.

- error if parent mtu is lower than child mtu (not bigger)

- return if child mtu is not defined

- fix vlan check (parent/child was inverted)
This commit is contained in:
Alexandre Derumier 2018-09-04 16:36:49 +02:00 committed by Wolfgang Bumiller
parent fb6134feaa
commit 000e32bc4a

View File

@ -759,11 +759,16 @@ my $check_mtu = sub {
die "check mtu - missing parent interface\n" if !$parent;
die "check mtu - missing child interface\n" if !$child;
my $pmtu = $ifaces->{$parent}->{mtu} ? $ifaces->{$parent}->{mtu} : 1500;
my $cmtu = $ifaces->{$child}->{mtu} ? $ifaces->{$child}->{mtu} : 1500;
my $cmtu = $ifaces->{$child}->{mtu};
return if !$cmtu;
die "interface '$parent' - mtu $pmtu is bigger than '$child' - mtu $cmtu\n"
if $pmtu > $cmtu;
my $parentdata = $ifaces->{$parent};
my $pmtu = $parentdata->{mtu};
$pmtu = $cmtu if $parentdata->{type} eq 'bond' && !$pmtu;
$pmtu = 1500 if !$pmtu;
die "interface '$parent' - mtu $pmtu is lower than '$child' - mtu $cmtu\n"
if $pmtu < $cmtu;
};
# config => {
@ -1393,7 +1398,7 @@ sub __write_etc_network_interfaces {
die "vlan '$iface' - wrong interface type on parent '$p' " .
"('$n->{type}' != 'eth|bond|bridge' )\n";
}
&$check_mtu($ifaces, $iface, $p);
&$check_mtu($ifaces, $p, $iface);
}
}