proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-17 09:52:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #2101: ipv6 ending in ':' not parsed as a string

Browse Source 
Space or newline after ':' is recognized as a mapping and as a result an
ipv6 ending in ':' is not parsed as a string. The solution is to quote
the address. For consistency all other addresses (including mac) are
quoted.

Signed-off-by: David Limbeck <d.limbeck@proxmox.com>
This commit is contained in:
David Limbeck 2019-02-21 16:18:53 +01:00 committed by Thomas Lamprecht
parent 769f187df5
commit 4efb58a96e
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
PVE/QemuServer/Cloudinit.pm
View File

@ -174,9 +174,9 @@ sub configdrive2_network {
} else { } else {
my ($addr, $mask) = split_ip4($net->{ip}); my ($addr, $mask) = split_ip4($net->{ip});
$content .= "iface $id inet static\n"; $content .= "iface $id inet static\n";
$content .= " address $addr\n"; $content .= " address '$addr'\n";
$content .= " netmask $mask\n"; $content .= " netmask '$mask'\n";
$content .= " gateway $net->{gw}\n" if $net->{gw}; $content .= " gateway '$net->{gw}'\n" if $net->{gw};
} }
} }
if ($net->{ip6}) { if ($net->{ip6}) {
@ -185,9 +185,9 @@ sub configdrive2_network {
} else { } else {
my ($addr, $mask) = split('/', $net->{ip6}); my ($addr, $mask) = split('/', $net->{ip6});
$content .= "iface $id inet6 static\n"; $content .= "iface $id inet6 static\n";
$content .= " address $addr\n"; $content .= " address '$addr'\n";
$content .= " netmask $mask\n"; $content .= " netmask '$mask'\n";
$content .= " gateway $net->{gw6}\n" if $net->{gw6}; $content .= " gateway '$net->{gw6}'\n" if $net->{gw6};
} }
} }
} }
@ -270,13 +270,13 @@ sub nocloud_network_v2 {
} }
if (@addresses) { if (@addresses) {
$content .= "${i}addresses:\n"; $content .= "${i}addresses:\n";
$content .= "${i}- $_\n" foreach @addresses; $content .= "${i}- '$_'\n" foreach @addresses;
} }
if (defined(my $gw = $ipconfig->{gw})) { if (defined(my $gw = $ipconfig->{gw})) {
$content .= "${i}gateway4: $gw\n"; $content .= "${i}gateway4: '$gw'\n";
} }
if (defined(my $gw = $ipconfig->{gw6})) { if (defined(my $gw = $ipconfig->{gw6})) {
$content .= "${i}gateway6: $gw\n"; $content .= "${i}gateway6: '$gw'\n";
} }
next if $dns_done; next if $dns_done;
@ -287,11 +287,11 @@ sub nocloud_network_v2 {
$content .= "${i}nameservers:\n"; $content .= "${i}nameservers:\n";
if (defined($nameservers) && @$nameservers) { if (defined($nameservers) && @$nameservers) {
$content .= "${i} addresses:\n"; $content .= "${i} addresses:\n";
$content .= "${i} - $_\n" foreach @$nameservers; $content .= "${i} - '$_'\n" foreach @$nameservers;
} }
if (defined($searchdomains) && @$searchdomains) { if (defined($searchdomains) && @$searchdomains) {
$content .= "${i} search:\n"; $content .= "${i} search:\n";
$content .= "${i} - $_\n" foreach @$searchdomains; $content .= "${i} - '$_'\n" foreach @$searchdomains;
} }
} }
} }
@ -321,7 +321,7 @@ sub nocloud_network {
$content .= "${i}- type: physical\n" $content .= "${i}- type: physical\n"
. "${i} name: eth$id\n" . "${i} name: eth$id\n"
. "${i} mac_address: $mac\n" . "${i} mac_address: '$mac'\n"
. "${i} subnets:\n"; . "${i} subnets:\n";
$i .= ' '; $i .= ' ';
if (defined(my $ip = $ipconfig->{ip})) { if (defined(my $ip = $ipconfig->{ip})) {
@ -330,10 +330,10 @@ sub nocloud_network {
} else { } else {
my ($addr, $mask) = split_ip4($ip); my ($addr, $mask) = split_ip4($ip);
$content .= "${i}- type: static\n" $content .= "${i}- type: static\n"
. "${i} address: $addr\n" . "${i} address: '$addr'\n"
. "${i} netmask: $mask\n"; . "${i} netmask: '$mask'\n";
if (defined(my $gw = $ipconfig->{gw})) { if (defined(my $gw = $ipconfig->{gw})) {
$content .= "${i} gateway: $gw\n"; $content .= "${i} gateway: '$gw'\n";
} }
} }
} }
@ -345,9 +345,9 @@ sub nocloud_network {
$content .= "${i}- type: dhcp6\n"; $content .= "${i}- type: dhcp6\n";
} else { } else {
$content .= "${i}- type: static\n" $content .= "${i}- type: static\n"
. "${i} address: $ip\n"; . "${i} address: '$ip'\n";
if (defined(my $gw = $ipconfig->{gw6})) { if (defined(my $gw = $ipconfig->{gw6})) {
$content .= "${i} gateway: $gw\n"; $content .= "${i} gateway: '$gw'\n";
} }
} }
} }
@ -359,11 +359,11 @@ sub nocloud_network {
$content .= "${i}- type: nameserver\n"; $content .= "${i}- type: nameserver\n";
if (defined($nameservers) && @$nameservers) { if (defined($nameservers) && @$nameservers) {
$content .= "${i} address:\n"; $content .= "${i} address:\n";
$content .= "${i} - $_\n" foreach @$nameservers; $content .= "${i} - '$_'\n" foreach @$nameservers;
} }
if (defined($searchdomains) && @$searchdomains) { if (defined($searchdomains) && @$searchdomains) {
$content .= "${i} search:\n"; $content .= "${i} search:\n";
$content .= "${i} - $_\n" foreach @$searchdomains; $content .= "${i} - '$_'\n" foreach @$searchdomains;
} }
} }