Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-08-29 09:49:33 +03:00
Code Releases Activity

decode comments in /etc/network/interfaces as utf8

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2018-09-13 14:55:51 +02:00
committed by Dietmar Maurer
parent d01452bdce
commit 1b505ae239
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/PVE/INotify.pm
View File

@ -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) = @_;