use Clone qw(clone);
use Linux::Inotify2;
use base 'Exporter';
-use JSON;
+use JSON;
+use Encode qw(encode decode);
our @EXPORT_OK = qw(read_file write_file register_file);
my $diff = '';
- open (TMP, "diff -b -N -u '$filename' '$shadow'|");
-
- while (my $line = <TMP>) {
- $diff .= $line;
- }
-
- close (TMP);
+ my $cmd = ['/usr/bin/diff', '-b', '-N', '-u', $filename, $shadow];
+ PVE::Tools::run_command($cmd, noerr => 1, outfunc => sub {
+ my ($line) = @_;
+ $diff .= decode('UTF-8', $line) . "\n";
+ });
$diff = undef if !$diff;
};
my $check_mtu = sub {
- my ($ifaces, $parent, $child) = @_;
+ my ($ifaces, $parent, $child) = @_;
- 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;
+ die "check mtu - missing parent interface\n" if !$parent;
+ die "check mtu - missing child interface\n" if !$child;
- die "interface '$parent' - mtu $pmtu is bigger than '$child' - mtu $cmtu\n"
- if $pmtu gt $cmtu;
+ my $cmtu = $ifaces->{$child}->{mtu};
+ return if !$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 => {
while (defined ($line = <$fh>)) {
chomp $line;
if ($line =~ m/^\s*#(.*?)\s*$/) {
- # NOTE: we use 'comments' instead of 'comment' to
- # avoid automatic utf8 conversion
$f->{comments} = '' if !$f->{comments};
- $f->{comments} .= "$1\n";
+ my $comment = decode('UTF-8', $1);
+ $f->{comments} .= "$comment\n";
} elsif ($line =~ m/^\s*(?:iface\s
|mapping\s
|auto\s
$done->{'bond_xmit_hash_policy'} = 1;
} elsif ($d->{type} eq 'vxlan') {
- foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
- $raw .= "\t$k $d->{$k}\n" if $d->{$k};
+ foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
+ $raw .= "\t$k $d->{$k}\n" if defined $d->{$k};
$done->{$k} = 1;
- }
+ }
if ($d->{'vxlan-remoteip'}) {
foreach my $remoteip (@{$d->{'vxlan-remoteip'}}) {
my ($filename, $fh, $config) = @_;
my $ifupdown2 = -e '/usr/share/ifupdown2';
my $raw = __write_etc_network_interfaces($config, $ifupdown2);
- PVE::Tools::safe_print($filename, $fh, $raw);
+ PVE::Tools::safe_print($filename, $fh, encode('UTF-8', $raw));
}
sub __write_etc_network_interfaces {
my ($config, $ifupdown2) = @_;
# delete unused OVS ports
foreach my $iface (keys %$ifaces) {
my $d = $ifaces->{$iface};
- if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
+ if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
$d->{type} eq 'OVSBond') {
my $brname = $used_ports->{$iface};
- if (!$brname || !$ifaces->{$brname}) {
+ if (!$brname || !$ifaces->{$brname}) {
if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
$ifaces->{$iface} = { type => 'eth',
exists => 1,
$n->{autostart} = 0;
if ($n->{type} eq 'eth') {
$n->{type} = 'OVSPort';
- $n->{ovs_bridge} = $iface;
+ $n->{ovs_bridge} = $iface;
} elsif ($n->{type} eq 'OVSBond' || $n->{type} eq 'OVSPort' ||
$n->{type} eq 'OVSIntPort') {
$n->{ovs_bridge} = $iface;
if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) {
my $vxlanid = $d->{'vxlan-id'};
- die "iface $iface : duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
+ die "iface $iface - duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
$vxlans->{$vxlanid} = $iface;
}
++$ips if defined $d->{'vxlan-remoteip'};
++$ips if defined $d->{'vxlan-local-tunnelip'};
if ($ips > 1) {
- die "ifac $iface : vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
+ die "iface $iface - vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
}
if (defined($d->{'vxlan-svcnodeip'}) != defined($d->{'vxlan-physdev'})) {
- die "iface $iface : vxlan-svcnodeip and vxlan-physdev must be define together\n";
+ die "iface $iface - vxlan-svcnodeip and vxlan-physdev must be define together\n";
}
#fixme : check if vxlan mtu is lower than 50bytes than physical interface where tunnel is going out
}
my $n = $ifaces->{$p};
die "vlan '$iface' - unable to find parent '$p'\n"
- if $n->{exists} eq 0;
+ if !$n;
if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) {
die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n";
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);
}
}
my $d = $ifaces->{$iface};
if ($d->{type} eq 'bridge') {
foreach my $p (split (/\s+/, $d->{bridge_ports})) {
+ $p =~ s/\.\d+$//;
my $n = $ifaces->{$p};
die "bridge '$iface' - unable to find bridge port '$p'\n"
if !$n;
my $d = $ifaces->{$iface};
foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) {
- die "iface $iface : bridgeports options can be used only if interface is in a bridge\n"
+ die "iface $iface - $k: bridge port specific options can be used only on interfaces attached to a bridge\n"
if $d->{$k} && !$bridgeports->{$iface};
}
if ($d->{'bridge-access'} && !$bridges->{$bridgeports->{$iface}}->{bridge_vlan_aware}) {
- die "iface $iface : bridge-access option can be only used if interface is in a vlan aware bridge\n";
+ die "iface $iface - bridge-access option can be only used if interface is in a vlan aware bridge\n";
}
}
projects / pve-common.git / blobdiff