use Fcntl qw(:DEFAULT :flock);
use PVE::SafeSyslog;
use PVE::Exception qw(raise_param_exc);
+use PVE::Network;
use PVE::Tools;
use PVE::ProcFSTools;
-use Storable qw(dclone);
+use Clone qw(clone);
use Linux::Inotify2;
use base 'Exporter';
use JSON;
return read_file ($filename, $full);
}
+sub poll_changes {
+ my ($filename) = @_;
+
+ poll() if $inotify; # read new inotify events
+
+ $versions->{$filename} = 0 if !defined ($versions->{$filename});
+
+ return $versions->{$filename};
+}
+
sub read_file {
my ($fileid, $full) = @_;
my $fd;
my $shadow;
- poll() if $inotify; # read new inotify events
-
- $versions->{$filename} = 0 if !defined ($versions->{$filename});
-
- my $cver = $versions->{$filename};
+ my $cver = poll_changes($filename);
if (my $copy = $shadowfiles->{$filename}) {
if ($fd = IO::File->new ($copy, "r")) {
# file unchanged?
if (!$ccinfo->{nocache} &&
- $inotify && $versions->{$filename} &&
+ $inotify && $cver &&
defined ($ccinfo->{data}) &&
defined ($ccinfo->{version}) &&
($ccinfo->{readonce} ||
- ($ccinfo->{version} == $versions->{$filename}))) {
+ ($ccinfo->{version} == $cver))) {
my $ret;
if (!$noclone && ref ($ccinfo->{data})) {
- $ret->{data} = dclone ($ccinfo->{data});
+ $ret->{data} = clone ($ccinfo->{data});
} else {
$ret->{data} = $ccinfo->{data};
}
}
# we cache data with references, so we always need to
- # dclone this data. Else the original data may get
+ # clone this data. Else the original data may get
# modified.
$ccinfo->{data} = $res;
my $ret;
if (!$noclone && ref ($ccinfo->{data})) {
- $ret->{data} = dclone ($ccinfo->{data});
+ $ret->{data} = clone ($ccinfo->{data});
} else {
$ret->{data} = $ccinfo->{data};
}
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',
+ 'bridge-vids' => 'bridge_vids'
+ };
+
my $line;
if ($proc_net_dev) {
while (defined ($line = <$proc_net_dev>)) {
- if ($line =~ m/^\s*(eth\d+|en[^:.]+|ib\d+):.*/) {
+ if ($line =~ m/^\s*($PVE::Network::PHYSICAL_NIC_RE):.*/) {
$ifaces->{$1}->{exists} = 1;
}
}
} 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' ||
} else {
$d->{$id} = 'off';
}
- } elsif ($id eq 'bridge_fd') {
+ } elsif ($id eq 'bridge_fd' || $id eq 'bridge_vids') {
$d->{$id} = $value;
} elsif ($id eq 'bridge_vlan_aware') {
$d->{$id} = 1;
$ifaces->{$1}->{exists} = 0;
$d->{exists} = 0;
}
- } elsif ($iface =~ m/^(?:eth\d+|en[^:.]+|ib\d+)$/) {
+ } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
if (!$d->{ovs_type}) {
$d->{type} = 'eth';
} elsif ($d->{ovs_type} eq 'OVSPort') {
}
sub __interface_to_string {
- my ($iface, $d, $family, $first_block) = @_;
+ my ($iface, $d, $family, $first_block, $ifupdown2) = @_;
(my $suffix = $family) =~ s/^inet//;
# not printing out options
} elsif ($d->{type} eq 'bridge') {
+ $d->{bridge_ports} =~ s/[;,\s]+/ /g;
my $ports = $d->{bridge_ports} || 'none';
- $raw .= "\tbridge_ports $ports\n";
+ $raw .= "\tbridge-ports $ports\n";
$done->{bridge_ports} = 1;
my $v = defined($d->{bridge_stp}) ? $d->{bridge_stp} : 'off';
- $raw .= "\tbridge_stp $v\n";
+ $raw .= "\tbridge-stp $v\n";
$done->{bridge_stp} = 1;
$v = defined($d->{bridge_fd}) ? $d->{bridge_fd} : 0;
- $raw .= "\tbridge_fd $v\n";
+ $raw .= "\tbridge-fd $v\n";
$done->{bridge_fd} = 1;
if( defined($d->{bridge_vlan_aware})) {
- $raw .= "\tbridge_vlan_aware yes\n";
+ $raw .= "\tbridge-vlan-aware yes\n";
+ $v = defined($d->{bridge_vids}) ? $d->{bridge_vids} : "2-4094";
+ $raw .= "\tbridge-vids $v\n";
}
$done->{bridge_vlan_aware} = 1;
+ $done->{bridge_vids} = 1;
} elsif ($d->{type} eq 'bond') {
+ $d->{slaves} =~ s/[;,\s]+/ /g;
my $slaves = $d->{slaves} || 'none';
- $raw .= "\tslaves $slaves\n";
+ $raw .= "\tbond-slaves $slaves\n";
$done->{slaves} = 1;
my $v = defined ($d->{'bond_miimon'}) ? $d->{'bond_miimon'} : 100;
- $raw .= "\tbond_miimon $v\n";
+ $raw .= "\tbond-miimon $v\n";
$done->{'bond_miimon'} = 1;
$v = defined ($d->{'bond_mode'}) ? $d->{'bond_mode'} : 'balance-rr';
- $raw .= "\tbond_mode $v\n";
+ $raw .= "\tbond-mode $v\n";
$done->{'bond_mode'} = 1;
if ($d->{'bond_mode'} && $d->{'bond_xmit_hash_policy'} &&
($d->{'bond_mode'} eq 'balance-xor' || $d->{'bond_mode'} eq '802.3ad')) {
- $raw .= "\tbond_xmit_hash_policy $d->{'bond_xmit_hash_policy'}\n";
+ $raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n";
}
$done->{'bond_xmit_hash_policy'} = 1;
$done->{ovs_type} = 1;
if ($d->{ovs_bridge}) {
- $raw = "allow-$d->{ovs_bridge} $iface\n$raw";
+
+ if ($ifupdown2) {
+ $raw = "auto $iface\n$raw";
+ } else {
+ $raw = "allow-$d->{ovs_bridge} $iface\n$raw";
+ }
+
$raw .= "\tovs_bridge $d->{ovs_bridge}\n";
$done->{ovs_bridge} = 1;
}
sub write_etc_network_interfaces {
my ($filename, $fh, $config) = @_;
- my $raw = __write_etc_network_interfaces($config);
+ my $ifupdown2 = -e '/usr/share/ifupdown2';
+ my $raw = __write_etc_network_interfaces($config, $ifupdown2);
PVE::Tools::safe_print($filename, $fh, $raw);
}
sub __write_etc_network_interfaces {
- my ($config) = @_;
+ my ($config, $ifupdown2) = @_;
my $ifaces = $config->{ifaces};
my @options = @{$config->{options}};
$d->{type} eq 'OVSBond') {
my $brname = $used_ports->{$iface};
if (!$brname || !$ifaces->{$brname}) {
- if ($iface =~ /^(?:eth|en)/) {
+ if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
$ifaces->{$iface} = { type => 'eth',
exists => 1,
method => 'manual',
my $pri;
if ($iface eq 'lo') {
$pri = $if_type_hash->{loopback};
- } elsif ($iface =~ m/^(?:eth\d+|en[^:.]+)$/) {
+ } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
$pri = $if_type_hash->{eth} + $child;
} elsif ($iface =~ m/^bond\d+$/) {
$pri = $if_type_hash->{bond} + $child;
$printed->{$iface} = 1;
$raw .= "auto $iface\n" if $d->{autostart};
my $i = 0; # some options should be printed only once
- $raw .= __interface_to_string($iface, $d, $_, !$i++) foreach @{$d->{families}};
+ $raw .= __interface_to_string($iface, $d, $_, !$i++, $ifupdown2) foreach @{$d->{families}};
}
$raw .= $_->[1] . "\n" foreach @options;
projects / pve-common.git / blobdiff