From 1b1fb9f70cf8f265ca52f19c955b3f648bb51445 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Wed, 20 Jun 2018 07:36:54 +0200 Subject: [PATCH] Inotify : read network config : allow alternative options names --- src/PVE/INotify.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index 445c034..b2ba33f 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -804,6 +804,18 @@ sub __read_etc_network_interfaces { my $ifaces = $config->{ifaces} = {}; 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; if ($proc_net_dev) { @@ -857,6 +869,9 @@ sub __read_etc_network_interfaces { } elsif ($line =~ m/^\s*((\S+)\s+(.+))$/) { my $option = $1; 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')) { $f->{$id} = $value; } elsif ($id eq 'ovs_type' || $id eq 'ovs_options'|| $id eq 'ovs_bridge' || -- 2.39.2