proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-15 22:17:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

read_etc_network_interfaces: less strict parsing

Browse Source 
*) Don't require indented lines, instead know when to end a
   section.
*) Don't require empty lines between sections.
*) Fixed non-/greedy regex issue

And turned (.*)\s* into just (.*) as .* eats the whitespace
too.
This commit is contained in:
Wolfgang Bumiller 2015-06-25 11:54:24 +02:00 committed by Dietmar Maurer
parent dc1c21d323
commit b1d7951f61
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/PVE/INotify.pm
View File

@ -766,30 +766,39 @@ sub read_etc_network_interfaces {
my $gateway = 0; my $gateway = 0;
while (defined ($line = <$fh>)) { SECTION: while (defined ($line = <$fh>)) {
chomp ($line); chomp ($line);
next if $line =~ m/^#/; next if $line =~ m/^\s*#/;
if ($line =~ m/^auto\s+(.*)$/) { if ($line =~ m/^\s*auto\s+(.*)$/) {
my @aa = split (/\s+/, $1); my @aa = split (/\s+/, $1);
foreach my $a (@aa) { foreach my $a (@aa) {
$ifaces->{$a}->{autostart} = 1; $ifaces->{$a}->{autostart} = 1;
} }
} elsif ($line =~ m/^iface\s+(\S+)\s+inet\s+(\S+)\s*$/) { } elsif ($line =~ m/^\s*iface\s+(\S+)\s+inet\s+(\S+)\s*$/) {
my $i = $1; my $i = $1;
$ifaces->{$i}->{method} = $2; $ifaces->{$i}->{method} = $2;
$ifaces->{$i}->{priority} = $priority++; $ifaces->{$i}->{priority} = $priority++;
my $d = $ifaces->{$i}; my $d = $ifaces->{$i};
while (defined ($line = <$fh>)) { while (defined ($line = <$fh>)) {
if ($line =~ m/^\s*#(.*)\s*$/) { chomp $line;
if ($line =~ m/^\s*#(.*?)\s*$/) {
# NOTE: we use 'comments' instead of 'comment' to # NOTE: we use 'comments' instead of 'comment' to
# avoid automatic utf8 conversion # avoid automatic utf8 conversion
$d->{comments} = '' if !$d->{comments}; $d->{comments} = '' if !$d->{comments};
$d->{comments} .= "$1\n"; $d->{comments} .= "$1\n";
} elsif ($line =~ m/^\s+((\S+)\s+(.+))$/) { } elsif ($line =~ m/^\s*(?:iface\s
|mapping\s
|auto\s
|allow-
|source\s
|source-directory\s
)/x) {
last;
} elsif ($line =~ m/^\s*((\S+)\s+(.+))$/) {
my $option = $1; my $option = $1;
my ($id, $value) = ($2, $3); my ($id, $value) = ($2, $3);
if (($id eq 'address') || ($id eq 'netmask') || ($id eq 'broadcast')) { if (($id eq 'address') || ($id eq 'netmask') || ($id eq 'broadcast')) {
@ -837,6 +846,8 @@ sub read_etc_network_interfaces {
last; last;
} }
} }
last SECTION if !defined($line);
redo SECTION;
} }
} }