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

Inotify : read network config : allow alternative options names

Browse Source
This commit is contained in:
Alexandre Derumier 2018-06-20 07:36:54 +02:00 committed by Wolfgang Bumiller
parent 37f010e7c6
commit 1b1fb9f70c
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/PVE/INotify.pm
View File

@ -804,6 +804,18 @@ sub __read_etc_network_interfaces {
my $ifaces = $config->{ifaces} = {}; my $ifaces = $config->{ifaces} = {};
my $options = $config->{options} = []; my $options = $config->{options} = [];
my $options_alternatives = {
'bond-slaves' => 'slaves',
'bond_slaves' => 'slaves',
'bond-xmit-hash-policy' => 'bond_xmit_hash_policy',
'bond-mode' => 'bond_mode',
'bond-miimon' =>'bond_miimon',
'bridge-vlan-aware' => 'bridge_vlan_aware',
'bridge-fd' => 'bridge_fd',
'bridge-stp' => 'bridge_stp',
'bridge-ports' => 'bridge_ports'
};
my $line; my $line;
if ($proc_net_dev) { if ($proc_net_dev) {
@ -857,6 +869,9 @@ sub __read_etc_network_interfaces {
} elsif ($line =~ m/^\s*((\S+)\s+(.+))$/) { } elsif ($line =~ m/^\s*((\S+)\s+(.+))$/) {
my $option = $1; my $option = $1;
my ($id, $value) = ($2, $3); my ($id, $value) = ($2, $3);
$id = $options_alternatives->{$id} if $options_alternatives->{$id};
if (($id eq 'address') || ($id eq 'netmask') || ($id eq 'broadcast') || ($id eq 'gateway')) { if (($id eq 'address') || ($id eq 'netmask') || ($id eq 'broadcast') || ($id eq 'gateway')) {
$f->{$id} = $value; $f->{$id} = $value;
} elsif ($id eq 'ovs_type' || $id eq 'ovs_options'|| $id eq 'ovs_bridge' || } elsif ($id eq 'ovs_type' || $id eq 'ovs_options'|| $id eq 'ovs_bridge' ||