use Fcntl qw(:DEFAULT :flock);
use PVE::SafeSyslog;
use PVE::Exception qw(raise_param_exc);
+use PVE::Network;
use PVE::Tools;
-use Storable qw(dclone);
+use PVE::ProcFSTools;
+use Clone qw(clone);
use Linux::Inotify2;
use base 'Exporter';
-use JSON;
+use JSON;
+use Digest::SHA;
+use Encode qw(encode decode);
our @EXPORT_OK = qw(read_file write_file register_file);
my $diff = '';
- open (TMP, "diff -b -N -u '$filename' '$shadow'|");
-
- while (my $line = <TMP>) {
- $diff .= $line;
- }
-
- close (TMP);
+ my $cmd = ['/usr/bin/diff', '-b', '-N', '-u', $filename, $shadow];
+ PVE::Tools::run_command($cmd, noerr => 1, outfunc => sub {
+ my ($line) = @_;
+ $diff .= decode('UTF-8', $line) . "\n";
+ });
$diff = undef if !$diff;
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};
}
sub register_regex {
my ($dir, $regex, $parser, $writer, $update, %options) = @_;
- die "can't register regex after initify_init" if $inotify;
+ die "can't register regex after inotify_init" if $inotify;
my $uid = "$dir/$regex";
die "regular expression '$uid' already added :ERROR" if defined ($ccacheregex->{$uid});
\&read_etc_hostname,
\&write_etc_hostname);
+sub read_etc_hosts {
+ my ($filename, $fh) = @_;
+
+ my $raw = '';
+ my $data = '';
+
+ while (my $line = <$fh>) {
+ $raw .= $line;
+ if ($line =~ m/^\s*#/) {
+ $line = decode('UTF-8', $line);
+ }
+ $data .= $line;
+ }
+
+ return {
+ digest => Digest::SHA::sha1_hex($raw),
+ data => $data,
+ }
+}
+
+sub write_etc_hosts {
+ my ($filename, $fh, $hosts, @args) = @_;
+
+ # check validity of ips/names
+ for my $line (split("\n", $hosts)) {
+ next if $line =~ m/^\s*#/; # comments
+ next if $line =~ m/^\s*$/; # whitespace/empty lines
+
+ my ($ip, @names) = split(/\s+/, $line);
+
+ raise_param_exc({ 'data' => "Invalid IP '$ip'" })
+ if $ip !~ m/^$PVE::Tools::IPRE$/;
+
+ for my $name (@names) {
+ raise_param_exc({ 'data' => "Invalid Hostname '$name'" })
+ if $name !~ m/^[.\-a-zA-Z0-9]+$/;
+ }
+ }
+
+ die "write failed: $!" if !print $fh encode('UTF-8', $hosts);
+
+ return $hosts;
+}
+
+register_file('etchosts', "/etc/hosts",
+ \&read_etc_hosts,
+ \&write_etc_hosts);
+
sub read_etc_resolv_conf {
my ($filename, $fh) = @_;
\&write_active_workers);
-my $bond_modes = { 'balance-rr' => 0,
+our $bond_modes = { 'balance-rr' => 0,
'active-backup' => 1,
'balance-xor' => 2,
'broadcast' => 3,
return $v;
};
+my $check_mtu = sub {
+ my ($ifaces, $parent, $child) = @_;
+
+ die "check mtu - missing parent interface\n" if !$parent;
+ die "check mtu - missing child interface\n" if !$child;
+
+ my $cmtu = $ifaces->{$child}->{mtu};
+ return if !$cmtu;
+
+ my $parentdata = $ifaces->{$parent};
+ my $pmtu = $parentdata->{mtu};
+ $pmtu = $cmtu if $parentdata->{type} eq 'bond' && !$pmtu;
+ $pmtu = 1500 if !$pmtu;
+
+ die "interface '$parent' - mtu $pmtu is lower than '$child' - mtu $cmtu\n"
+ if $pmtu < $cmtu;
+};
+
# config => {
# ifaces => {
# $ifname => {
sub read_etc_network_interfaces {
my ($filename, $fh) = @_;
my $proc_net_dev = IO::File->new('/proc/net/dev', 'r');
- my $proc_net_if_inet6 = IO::File->new('/proc/net/if_inet6', 'r');
- return __read_etc_network_interfaces($fh, $proc_net_dev, $proc_net_if_inet6);
+ my $active = PVE::ProcFSTools::get_active_network_interfaces();
+ return __read_etc_network_interfaces($fh, $proc_net_dev, $active);
}
sub __read_etc_network_interfaces {
- my ($fh, $proc_net_dev, $proc_net_if_inet6) = @_;
+ my ($fh, $proc_net_dev, $active_ifaces) = @_;
my $config = {};
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+):.*/) {
+ if ($line =~ m/^\s*($PVE::Network::PHYSICAL_NIC_RE):.*/) {
$ifaces->{$1}->{exists} = 1;
}
}
while (defined ($line = <$fh>)) {
chomp $line;
if ($line =~ m/^\s*#(.*?)\s*$/) {
- # NOTE: we use 'comments' instead of 'comment' to
- # avoid automatic utf8 conversion
$f->{comments} = '' if !$f->{comments};
- $f->{comments} .= "$1\n";
+ my $comment = decode('UTF-8', $1);
+ $f->{comments} .= "$comment\n";
} elsif ($line =~ m/^\s*(?:iface\s
|mapping\s
|auto\s
} elsif ($line =~ m/^\s*((\S+)\s+(.+))$/) {
my $option = $1;
my ($id, $value) = ($2, $3);
+
+ $id = $options_alternatives->{$id} if $options_alternatives->{$id};
+
+ my $simple_options = {
+ 'mtu' => 1,
+ 'ovs_type' => 1,
+ 'ovs_options' => 1,
+ 'ovs_bridge' => 1,
+ 'ovs_bonds' => 1,
+ 'ovs_ports' => 1,
+ 'bridge_fd' => 1,
+ 'bridge_vids' => 1,
+ 'bridge-access' => 1,
+ 'bridge-learning' => 1,
+ 'bridge-arp-nd-suppress' => 1,
+ 'bridge-unicast-flood' => 1,
+ 'bridge-multicast-flood' => 1,
+ 'bond_miimon' => 1,
+ 'bond_xmit_hash_policy' => 1,
+ 'vlan-protocol' => 1,
+ 'vxlan-id' => 1,
+ 'vxlan-svcnodeip' => 1,
+ 'vxlan-physdev' => 1,
+ 'vxlan-local-tunnelip' => 1 };
+
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' ||
- $id eq 'ovs_bonds' || $id eq 'ovs_ports') {
+ } elsif ($simple_options->{$id}) {
$d->{$id} = $value;
} elsif ($id eq 'slaves' || $id eq 'bridge_ports') {
my $devs = {};
} else {
$d->{$id} = 'off';
}
- } elsif ($id eq 'bridge_fd') {
- $d->{$id} = $value;
} elsif ($id eq 'bridge_vlan_aware') {
$d->{$id} = 1;
- } elsif ($id eq 'bond_miimon') {
- $d->{$id} = $value;
- } elsif ($id eq 'bond_xmit_hash_policy') {
- $d->{$id} = $value;
} elsif ($id eq 'bond_mode') {
# always use names
foreach my $bm (keys %$bond_modes) {
}
}
$d->{$id} = $value;
+ } elsif ($id eq 'vxlan-remoteip') {
+ push @{$d->{$id}}, $value;
} else {
push @{$f->{options}}, $option;
}
}
}
-
+ foreach my $ifname (@$active_ifaces) {
+ if (my $iface = $ifaces->{$ifname}) {
+ $iface->{active} = 1;
+ }
+ }
if (!$ifaces->{lo}) {
$ifaces->{lo}->{priority} = 1;
$ifaces->{$1}->{exists} = 0;
$d->{exists} = 0;
}
- } elsif ($iface =~ m/^eth\d+$/) {
+ } elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
if (!$d->{ovs_type}) {
$d->{type} = 'eth';
} elsif ($d->{ovs_type} eq 'OVSPort') {
} elsif ($iface =~ m/^lo$/) {
$d->{type} = 'loopback';
} else {
- if (!$d->{ovs_type}) {
+ if ($d->{'vxlan-id'}) {
+ $d->{type} = 'vxlan';
+ } elsif (!$d->{ovs_type}) {
$d->{type} = 'unknown';
} elsif ($d->{ovs_type} eq 'OVSIntPort') {
$d->{type} = $d->{ovs_type};
$d->{families} ||= ['inet'];
}
- if ($proc_net_if_inet6) {
- while (defined ($line = <$proc_net_if_inet6>)) {
- if ($line =~ m/^[a-f0-9]{32}\s+[a-f0-9]{2}\s+[a-f0-9]{2}\s+[a-f0-9]{2}\s+[a-f0-9]{2}\s+(\S+)$/) {
- $ifaces->{$1}->{active} = 1 if defined($ifaces->{$1});
- }
- }
- close ($proc_net_if_inet6);
- }
-
# OVS bridges create "allow-$BRIDGE $IFACE" lines which we need to remove
# from the {options} hash for them to be removed correctly.
@$options = grep {defined($_)} map {
}
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;
+ } elsif ($d->{type} eq 'vlan') {
+ die "$iface: wrong vlan-protocol $d->{'vlan-protocol'}\n"
+ if $d->{'vlan-protocol'} && $d->{'vlan-protocol'} ne '802.1ad' && $d->{'vlan-protocol'} ne '802.1q';
+
+ } elsif ($d->{type} eq 'vxlan') {
+
+ foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
+ $raw .= "\t$k $d->{$k}\n" if defined $d->{$k};
+ $done->{$k} = 1;
+ }
+ if ($d->{'vxlan-remoteip'}) {
+ foreach my $remoteip (@{$d->{'vxlan-remoteip'}}) {
+ $raw .= "\tvxlan-remoteip $remoteip\n";
+ }
+ $done->{'vxlan-remoteip'} = 1;
+ }
} elsif ($d->{type} eq 'OVSBridge') {
$raw .= "\tovs_type $d->{type}\n";
$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;
}
if ($first_block) {
# print other settings
- foreach my $k (keys %$d) {
+ foreach my $k (sort keys %$d) {
next if $done->{$k};
next if !$d->{$k};
$raw .= "\t$k $d->{$k}\n";
sub write_etc_network_interfaces {
my ($filename, $fh, $config) = @_;
- my $raw = __write_etc_network_interfaces($config);
- PVE::Tools::safe_print($filename, $fh, $raw);
+ my $ifupdown2 = -e '/usr/share/ifupdown2';
+ my $raw = __write_etc_network_interfaces($config, $ifupdown2);
+ PVE::Tools::safe_print($filename, $fh, encode('UTF-8', $raw));
}
sub __write_etc_network_interfaces {
- my ($config) = @_;
+ my ($config, $ifupdown2) = @_;
my $ifaces = $config->{ifaces};
my @options = @{$config->{options}};
# delete unused OVS ports
foreach my $iface (keys %$ifaces) {
my $d = $ifaces->{$iface};
- if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
+ if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
$d->{type} eq 'OVSBond') {
my $brname = $used_ports->{$iface};
- if (!$brname || !$ifaces->{$brname}) {
- if ($iface =~ /^eth/) {
+ if (!$brname || !$ifaces->{$brname}) {
+ if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
$ifaces->{$iface} = { type => 'eth',
exists => 1,
method => 'manual',
$n->{autostart} = 0;
if ($n->{type} eq 'eth') {
$n->{type} = 'OVSPort';
- $n->{ovs_bridge} = $iface;
+ $n->{ovs_bridge} = $iface;
} elsif ($n->{type} eq 'OVSBond' || $n->{type} eq 'OVSPort' ||
$n->{type} eq 'OVSIntPort') {
$n->{ovs_bridge} = $iface;
} else {
die "interface '$p' is not defined as OVS port/bond\n";
}
+
+ &$check_mtu($ifaces, $iface, $p);
}
}
}
if !$n;
die "OVS bond '$iface' - wrong interface type on slave '$p' " .
"('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
+ &$check_mtu($ifaces, $iface, $p);
}
}
}
+ # check bond
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+ if ($d->{type} eq 'bond' && $d->{slaves}) {
+ foreach my $p (split (/\s+/, $d->{slaves})) {
+ my $n = $ifaces->{$p};
+
+ die "bond '$iface' - unable to find slave '$p'\n"
+ if !$n;
+ die "bond '$iface' - wrong interface type on slave '$p' " .
+ "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
+ &$check_mtu($ifaces, $iface, $p);
+ }
+ }
+ }
+
+ # check vxlan
+ my $vxlans = {};
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+
+ if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) {
+ my $vxlanid = $d->{'vxlan-id'};
+ die "iface $iface - duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
+ $vxlans->{$vxlanid} = $iface;
+ }
+
+ my $ips = 0;
+ ++$ips if defined $d->{'vxlan-svcnodeip'};
+ ++$ips if defined $d->{'vxlan-remoteip'};
+ ++$ips if defined $d->{'vxlan-local-tunnelip'};
+ if ($ips > 1) {
+ die "iface $iface - vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
+ }
+
+ if (defined($d->{'vxlan-svcnodeip'}) != defined($d->{'vxlan-physdev'})) {
+ die "iface $iface - vxlan-svcnodeip and vxlan-physdev must be define together\n";
+ }
+ #fixme : check if vxlan mtu is lower than 50bytes than physical interface where tunnel is going out
+ }
+
+ # check vlan
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+ if ($d->{type} eq 'vlan' && $iface =~ m/^(\S+)\.\d+$/) {
+ my $p = $1;
+ my $n = $ifaces->{$p};
+
+ die "vlan '$iface' - unable to find parent '$p'\n"
+ if !$n;
+
+ if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) {
+ die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n";
+ } elsif ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond' && $n->{type} ne 'vlan') {
+ die "vlan '$iface' - wrong interface type on parent '$p' " .
+ "('$n->{type}' != 'eth|bond|bridge|vlan' )\n";
+ }
+
+ &$check_mtu($ifaces, $p, $iface);
+
+ }
+ }
+
+ # check bridgeport option
+ my $bridgeports = {};
+ my $bridges = {};
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+ if ($d->{type} eq 'bridge') {
+ foreach my $p (split (/\s+/, $d->{bridge_ports})) {
+ $p =~ s/\.\d+$//;
+ my $n = $ifaces->{$p};
+ die "bridge '$iface' - unable to find bridge port '$p'\n"
+ if !$n;
+ &$check_mtu($ifaces, $iface, $p);
+ $bridgeports->{$p} = $iface;
+ }
+ $bridges->{$iface} = $d;
+ }
+ }
+
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+
+ foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) {
+ die "iface $iface - $k: bridge port specific options can be used only on interfaces attached to a bridge\n"
+ if $d->{$k} && !$bridgeports->{$iface};
+ }
+
+ if ($d->{'bridge-access'} && !$bridges->{$bridgeports->{$iface}}->{bridge_vlan_aware}) {
+ die "iface $iface - bridge-access option can be only used if interface is in a vlan aware bridge\n";
+ }
+ }
+
my $raw = <<'NETWORKDOC';
# network interface settings; autogenerated
# Please do NOT modify this file directly, unless you know what
# you're doing.
#
-# If you want to manage part of the network configuration manually,
+# If you want to manage parts of the network configuration manually,
# please utilize the 'source' or 'source-directory' directives to do
# so.
-# PVE will preserve these directives, but will NOT its network
+# PVE will preserve these directives, but will NOT read its network
# configuration from sourced files, so do not attempt to move any of
# the PVE managed interfaces into external files!
my $if_type_hash = {
loopback => 100000,
eth => 200000,
+ OVSPort => 200000,
+ OVSIntPort => 200000,
bond => 300000,
bridge => 400000,
+ OVSBridge => 400000,
+ vxlan => 500000,
};
my $lookup_type_prio = sub {
- my $iface = shift;
+ my ($iface, $ifaces) = @_;
- my $child = 0;
- if ($iface =~ m/^(\S+)(\.|:)\d+$/) {
- $iface = $1;
- $child = 1;
- }
+ my ($rootiface, @rest) = split(/[.:]/, $iface);
+ my $childlevel = scalar(@rest);
+ my $n = $ifaces->{$rootiface};
- my $pri;
- if ($iface eq 'lo') {
- $pri = $if_type_hash->{loopback};
- } elsif ($iface =~ m/^eth\d+$/) {
- $pri = $if_type_hash->{eth} + $child;
- } elsif ($iface =~ m/^bond\d+$/) {
- $pri = $if_type_hash->{bond} + $child;
- } elsif ($iface =~ m/^vmbr\d+$/) {
- $pri = $if_type_hash->{bridge} + $child;
- }
+ my $pri = $if_type_hash->{$n->{type}} + $childlevel
+ if $n->{type} && $n->{type} ne 'unknown';
return $pri;
};
foreach my $iface (sort {
my $ref1 = $ifaces->{$a};
my $ref2 = $ifaces->{$b};
- my $tp1 = &$lookup_type_prio($a);
- my $tp2 = &$lookup_type_prio($b);
+ my $tp1 = &$lookup_type_prio($a, $ifaces);
+ my $tp2 = &$lookup_type_prio($b, $ifaces);
# Only recognized types are in relation to each other. If one type
# is unknown then only consider the interfaces' priority attributes.
$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;