michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2018-07-29 18:29:47 -07:00
parent c6259d4d7f b824e8c98f
commit 40c79d6dbe
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net/netplan-lib.pl
View File

@@ -34,6 +34,11 @@ foreach my $f (glob("$netplan_dir/*.yaml")) {
if (&is_true_value($dhcp)) {
$cfg->{'dhcp'} = 1;
}
my ($dhcp6) = grep { $_->{'name'} eq 'dhcp6' }
@{$e->{'members'}};
if (&is_true_value($dhcp6)) {
$cfg->{'dhcp6'} = 1;
}
# Is optional at boot?
my ($optional) = grep { $_->{'name'} eq 'optional' }
@@ -163,6 +168,9 @@ else {
push(@addrs, $iface->{'address'}."/".
&mask_to_prefix($iface->{'netmask'}));
}
if ($iface->{'dhcp6'}) {
push(@lines, $id." "."dhcp6: true");
}
for(my $i=0; $i<@{$iface->{'address6'}}; $i++) {
push(@addrs, $iface->{'address6'}->[$i]."/".
$iface->{'netmask6'}->[$i]);