From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id ED3C061DF8
for <pve-devel@lists.proxmox.com>; Fri, 10 Jul 2020 18:43:49 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E893B24AE0
for <pve-devel@lists.proxmox.com>; Fri, 10 Jul 2020 18:43:49 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 0245524AD8
for <pve-devel@lists.proxmox.com>; Fri, 10 Jul 2020 18:43:49 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BD7F24311A
for <pve-devel@lists.proxmox.com>; Fri, 10 Jul 2020 18:43:48 +0200 (CEST)
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 10 Jul 2020 18:43:34 +0200
Message-Id: <20200710164334.23819-1-s.ivanov@proxmox.com>
X-Mailer: git-send-email 2.20.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [debian.pm]
Subject: [pve-devel] [PATCH container] setup/debian: use cidr for buster and
newer
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 10 Jul 2020 16:43:50 -0000
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