proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-02 05:22:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #2374: bridge-ports is assumed to be defined

Browse Source 
bridge-ports is an optional parameter but was assumed to be defined in
the code. This resulted in 'use of uninitialized value' warnings.

By reordering of the $ports definition before the replace, we get rid of
the 'use of uninitialized value' when no bridge-port is specified.

In the second case we set it to an empty string when it is undefined.

Signed-off-by: Mira Limbeck <m.limbeck@proxmox.com>
This commit is contained in:
Mira Limbeck 2020-06-10 16:03:38 +02:00 committed by Thomas Lamprecht
parent 7157e9bd98
commit 8342b610ea
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/INotify.pm
View File

@ -1236,8 +1236,8 @@ sub __interface_to_string {
# not printing out options # not printing out options
} elsif ($d->{type} eq 'bridge') { } elsif ($d->{type} eq 'bridge') {
$d->{bridge_ports} =~ s/[;,\s]+/ /g;
my $ports = $d->{bridge_ports} || 'none'; my $ports = $d->{bridge_ports} || 'none';
$ports =~ s/[;,\s]+/ /g;
$raw .= "\tbridge-ports $ports\n"; $raw .= "\tbridge-ports $ports\n";
$done->{bridge_ports} = 1; $done->{bridge_ports} = 1;
@ -1605,7 +1605,7 @@ sub __write_etc_network_interfaces {
foreach my $iface (keys %$ifaces_copy) { foreach my $iface (keys %$ifaces_copy) {
my $d = $ifaces_copy->{$iface}; my $d = $ifaces_copy->{$iface};
if ($d->{type} eq 'bridge') { if ($d->{type} eq 'bridge') {
foreach my $p (split (/\s+/, $d->{bridge_ports})) { foreach my $p (split (/\s+/, $d->{bridge_ports} // '')) {
if($p =~ m/(\S+)\.(\d+)$/) { if($p =~ m/(\S+)\.(\d+)$/) {
my $vlanparent = $1; my $vlanparent = $1;
if (!defined($ifaces_copy->{$p})) { if (!defined($ifaces_copy->{$p})) {