[pve-devel] [PATCH container] setup/debian: use cidr for buster and newer

[pve-devel] [PATCH container] setup/debian: use cidr for buster and newer

[Stoiko Ivanov]

starting with version 0.8.35 of ifupdown (shipped currently with buster)
the configuration using a separate 'netmask' line instead of providing the
cidr in the 'address' line of a interface stanza of /etc/network/interfaces
is deprecated.

This means that some software installed on newer debian versions, which
parses /etc/network/interfaces may not support the format currently written
by PVE::LXC::Setup::Debian::setup_network.

This patch changes the content of the generated file to use the newer format
only for newer versions of debian (alpine, older ubuntu versions and devuan
also rely on the sub to generate the network config)

caught by installing proxmox-backup-server on a debian buster container and
getting a parse-error in the network configuration tab in the GUI.

tested by creating a ubuntu-14.04, debian-6, debian-8 and a debian-10
container and checking the resulting /etc/network/interfaces.

[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=912220

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 src/PVE/LXC/Setup/Debian.pm | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/PVE/LXC/Setup/Debian.pm b/src/PVE/LXC/Setup/Debian.pm
index 1d14606..13a2d55 100644
--- a/src/PVE/LXC/Setup/Debian.pm
+++ b/src/PVE/LXC/Setup/Debian.pm
@@ -157,6 +157,7 @@ sub setup_network {
 		    my $ipinfo = PVE::LXC::parse_ipv4_cidr($d->{ip});
 		    $net->{address} = $ipinfo->{address};
 		    $net->{netmask} = $ipinfo->{netmask};
+		    $net->{cidr} = $d->{ip};
 		    $cidr = $d->{ip};
 		}
 	    }
@@ -176,6 +177,7 @@ sub setup_network {
 		} else {
 		    $net->{address6} = $1;
 		    $net->{netmask6} = $2;
+		    $net->{cidr6} = $d->{ip6};
 		    $cidr = $d->{ip6};
 		}
 	    }
@@ -222,9 +224,12 @@ sub setup_network {
 		$interfaces .= "iface $ifname inet $1\n\n";
 	    } else {
 		$interfaces .= "iface $ifname inet static\n";
-		$interfaces .= "\taddress $net->{address}\n" if defined($net->{address});
-		$interfaces .= "\tnetmask $net->{netmask}\n" if defined($net->{netmask});
-
+		if ($conf->{ostype} eq "debian" && $self->{version} >= 10) {
+		    $interfaces .= "\taddress $net->{cidr}\n" if defined($net->{cidr});
+		} else {
+		    $interfaces .= "\taddress $net->{address}\n" if defined($net->{address});
+		    $interfaces .= "\tnetmask $net->{netmask}\n" if defined($net->{netmask});
+		}
 		remove_gateway_scripts($section->{attr});
 		if (defined(my $gw = $net->{gateway})) {
 		    if ($net->{needsroute}) {
@@ -247,8 +252,12 @@ sub setup_network {
 		$interfaces .= "iface $ifname inet6 $1\n\n";
 	    } else {
 		$interfaces .= "iface $ifname inet6 static\n";
-		$interfaces .= "\taddress $net->{address6}\n" if defined($net->{address6});
-		$interfaces .= "\tnetmask $net->{netmask6}\n" if defined($net->{netmask6});
+		if ($conf->{ostype} eq "debian" && $self->{version} >= 10) {
+		    $interfaces .= "\taddress $net->{cidr6}\n" if defined($net->{cidr6});
+		} else {
+		    $interfaces .= "\taddress $net->{address6}\n" if defined($net->{address6});
+		    $interfaces .= "\tnetmask $net->{netmask6}\n" if defined($net->{netmask6});
+		}
 		remove_gateway_scripts($section->{attr});
 		if (defined(my $gw = $net->{gateway6})) {
 		    if ($net->{needsroute6}) {
-- 
2.20.1

[pve-devel] applied: Re: [PATCH container] setup/debian: use cidr for buster and newer

[Thomas Lamprecht]

On 10.07.20 18:43, Stoiko Ivanov wrote:
> starting with version 0.8.35 of ifupdown (shipped currently with buster)
> the configuration using a separate 'netmask' line instead of providing the
> cidr in the 'address' line of a interface stanza of /etc/network/interfaces
> is deprecated.
> 
> This means that some software installed on newer debian versions, which
> parses /etc/network/interfaces may not support the format currently written
> by PVE::LXC::Setup::Debian::setup_network.
> 
> This patch changes the content of the generated file to use the newer format
> only for newer versions of debian (alpine, older ubuntu versions and devuan
> also rely on the sub to generate the network config)
> 
> caught by installing proxmox-backup-server on a debian buster container and
> getting a parse-error in the network configuration tab in the GUI.
> 
> tested by creating a ubuntu-14.04, debian-6, debian-8 and a debian-10
> container and checking the resulting /etc/network/interfaces.
> 
> [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=912220
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
>  src/PVE/LXC/Setup/Debian.pm | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
> 
>

applied, thanks!