X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;h=f83759673e9bdefa19d7cc1aeb7382c5c65ccb53;hp=6892b4c6bf25eb517a881874437aaf9e56e0e32f;hb=9194ee0657800037907ae8670cfdb214952f18bf;hpb=fc158d0d9c99ed4523e30043a3705f812445c7b5

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 6892b4c..f837596 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -19,7 +19,9 @@ use PVE::ProcFSTools;
 use Clone qw(clone);
 use Linux::Inotify2;
 use base 'Exporter';
-use JSON; 
+use JSON;
+use Digest::SHA;
+use Encode qw(encode decode);
 
 our @EXPORT_OK = qw(read_file write_file register_file);
 
@@ -56,13 +58,11 @@ sub ccache_compute_diff {
 
     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;
 
@@ -538,6 +538,54 @@ register_file('hostname', "/etc/hostname",
 	      \&read_etc_hostname, 
 	      \&write_etc_hostname);
 
+sub read_etc_hosts {
+    my ($filename, $fh) = @_;
+
+    my $raw = '';
+    my $data = '';
+
+    while (my $line = <$fh>) {
+	$raw .= $line;
+	if ($line =~ m/^\s*#/) {
+	    $line = decode('UTF-8', $line);
+	}
+	$data .= $line;
+    }
+
+    return {
+	digest => Digest::SHA::sha1_hex($raw),
+	data => $data,
+    }
+}
+
+sub write_etc_hosts {
+    my ($filename, $fh, $hosts, @args) = @_;
+
+    # check validity of ips/names
+    for my $line (split("\n", $hosts)) {
+	next if $line =~ m/^\s*#/; # comments
+	next if $line =~ m/^\s*$/; # whitespace/empty lines
+
+	my ($ip, @names) = split(/\s+/, $line);
+
+	raise_param_exc({ 'data' => "Invalid IP '$ip'" })
+	    if $ip !~ m/^$PVE::Tools::IPRE$/;
+
+	for my $name (@names) {
+	    raise_param_exc({ 'data' => "Invalid Hostname '$name'" })
+		if $name !~ m/^[.\-a-zA-Z0-9]+$/;
+	}
+    }
+
+    die "write failed: $!" if !print $fh encode('UTF-8', $hosts);
+
+    return $hosts;
+}
+
+register_file('etchosts', "/etc/hosts",
+	      \&read_etc_hosts,
+	      \&write_etc_hosts);
+
 sub read_etc_resolv_conf {
     my ($filename, $fh) = @_;
 
@@ -759,11 +807,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;
+
+    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 bigger than '$child' - mtu $cmtu\n"
-	if $pmtu > $cmtu;
+    die "interface '$parent' - mtu $pmtu is lower than '$child' - mtu $cmtu\n"
+	if $pmtu < $cmtu;
 };
 
 # config => {
@@ -868,10 +921,9 @@ sub __read_etc_network_interfaces {
 	    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
@@ -1247,7 +1299,7 @@ sub write_etc_network_interfaces {
     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) = @_;
@@ -1393,7 +1445,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);
 	}
     }
 
@@ -1404,6 +1456,7 @@ sub __write_etc_network_interfaces {
 	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;