decode comments in /etc/network/interfaces as utf8

[pve-common.git] / src / PVE / INotify.pm

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index e37b4af6b5994b02b060e04511e473f1ea00d5f2..dee9a3e9b2b6a48b0780b5a76feda425b269e5c1 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -873,10 +873,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
@@ -1252,7 +1251,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) = @_;
@@ -1409,6 +1408,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;