return $content;
}
+sub split_ip4 {
+ my ($ip) = @_;
+ my ($addr, $mask) = split('/', $ip);
+ die "not a CIDR: $ip\n" if !defined $mask;
+ return ($addr, $PVE::Network::ipv4_reverse_mask->[$mask]);
+}
+
sub configdrive2_network {
my ($conf) = @_;
if ($net->{ip} eq 'dhcp') {
$content .= "iface $id inet dhcp\n";
} else {
- my ($addr, $mask) = split('/', $net->{ip});
+ my ($addr, $mask) = split_ip4($net->{ip});
$content .= "iface $id inet static\n";
$content .= " address $addr\n";
- $content .= " netmask $PVE::Network::ipv4_reverse_mask->[$mask]\n";
+ $content .= " netmask $mask\n";
$content .= " gateway $net->{gw}\n" if $net->{gw};
}
}
if ($ip eq 'dhcp') {
$content .= "${i}- type: dhcp4\n";
} else {
+ my ($addr, $mask) = split_ip4($ip);
$content .= "${i}- type: static\n"
- . "${i} address: $ip\n";
+ . "${i} address: $addr\n"
+ . "${i} netmask: $mask\n";
if (defined(my $gw = $ipconfig->{gw})) {
$content .= "${i} gateway: $gw\n";
}