[pve-devel] [PATCH container] setup: systemd-network: use correct values for dhcp-modes

[pve-devel] [PATCH container] setup: systemd-network: use correct values for dhcp-modes

[Stoiko Ivanov]

the change from v4->ipv4 happened 2015 in systemd commit
cb9fc36a1211967e8c58b0502a26c42552ac8060 - so by now it should be
safe to replace it for all containers relying on systemd-networkd.

This change follows fb554c701f1e9cac4b278fd6b82a4f2b45da8acf (in
pve-container) but in this case the issue is only cosmetic for now.

Noticed with a current arch-linux container

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---

 src/PVE/LXC/Setup/Base.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/LXC/Setup/Base.pm b/src/PVE/LXC/Setup/Base.pm
index c88bf03..5534397 100644
--- a/src/PVE/LXC/Setup/Base.pm
+++ b/src/PVE/LXC/Setup/Base.pm
@@ -261,7 +261,7 @@ DATA
 	my ($has_ipv4, $has_ipv6);
 
 	# DHCP bitflags:
-	my @DHCPMODES = ('no', 'v4', 'v6', 'yes');
+	my @DHCPMODES = ('no', 'ipv4', 'ipv6', 'yes');
 	my ($NONE, $DHCP4, $DHCP6, $BOTH) = (0, 1, 2, 3);
 	my $dhcp = $NONE;
 	my $accept_ra = 'false';
-- 
2.30.2

[pve-devel] applied: Re: [PATCH container] setup: systemd-network: use correct values for dhcp-modes

[Thomas Lamprecht]

On 09/06/2023 15:05, Stoiko Ivanov wrote:
> the change from v4->ipv4 happened 2015 in systemd commit
> cb9fc36a1211967e8c58b0502a26c42552ac8060 - so by now it should be
> safe to replace it for all containers relying on systemd-networkd.

yeah, especially as cgroup v2 switch brought us some lower bound
in what systemd version is supported by default, i.e., without
booting into legacy hierarchy again.

> 
> This change follows fb554c701f1e9cac4b278fd6b82a4f2b45da8acf (in
> pve-container) but in this case the issue is only cosmetic for now.
> 
> Noticed with a current arch-linux container
> 
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> 
>  src/PVE/LXC/Setup/Base.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!