[pve-devel] [PATCH container] fix #4164: use DHCP=yes instead of DHCP=both in systemd-networkd config

[pve-devel] [PATCH container] fix #4164: use DHCP=yes instead of DHCP=both in systemd-networkd config

[Oguz Bektas]

"both" option is deprecated, this gets rid of the warning in the journal

Signed-off-by: Oguz Bektas <o.bektas@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 8580bf0..cc12914 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', 'both');
+	my @DHCPMODES = ('no', 'v4', 'v6', 'yes');
 	my ($NONE, $DHCP4, $DHCP6, $BOTH) = (0, 1, 2, 3);
 	my $dhcp = $NONE;
 	my $accept_ra = 'false';
-- 
2.30.2

Re: [pve-devel] [PATCH container] fix #4164: use DHCP=yes instead of DHCP=both in systemd-networkd config

[Fabian Grünbichler]

On July 19, 2022 1:24 pm, Oguz Bektas wrote:
> "both" option is deprecated, this gets rid of the warning in the journal
> 
> Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>

some notion which templates you tested this with, when the deprecation 
happened in systemd, whether we need a fallback to 'both' for older 
versions, etc.pp. would be nice to have..

AFAICT the deprecation was in systemd v219, so should probably be okay 
to switch unconditionally..

> ---
>  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 8580bf0..cc12914 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', 'both');
> +	my @DHCPMODES = ('no', 'v4', 'v6', 'yes');
>  	my ($NONE, $DHCP4, $DHCP6, $BOTH) = (0, 1, 2, 3);
>  	my $dhcp = $NONE;
>  	my $accept_ra = 'false';
> -- 
> 2.30.2
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 

Re: [pve-devel] [PATCH container] fix #4164: use DHCP=yes instead of DHCP=both in systemd-networkd config

[Oguz Bektas]

On Tue, Jul 19, 2022 at 01:52:37PM +0200, Fabian Grünbichler wrote:
> On July 19, 2022 1:24 pm, Oguz Bektas wrote:
> > "both" option is deprecated, this gets rid of the warning in the journal
> > 
> > Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> 
> some notion which templates you tested this with, when the deprecation 
> happened in systemd, whether we need a fallback to 'both' for older 
> versions, etc.pp. would be nice to have..
> 
> AFAICT the deprecation was in systemd v219, so should probably be okay 
> to switch unconditionally..

yes, all our current templates are using the newer systemd versions, so
no need for a fallback IMO.

i tested it with:
* arch
* fedora 35 and 36
* ubuntu 20 and 22
templates, it got rid of the warning in all of them.

> 
> > ---
> >  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 8580bf0..cc12914 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', 'both');
> > +	my @DHCPMODES = ('no', 'v4', 'v6', 'yes');
> >  	my ($NONE, $DHCP4, $DHCP6, $BOTH) = (0, 1, 2, 3);
> >  	my $dhcp = $NONE;
> >  	my $accept_ra = 'false';
> > -- 
> > 2.30.2
> > 
> > 
> > 
> > _______________________________________________
> > pve-devel mailing list
> > pve-devel@lists.proxmox.com
> > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> > 
> > 
> > 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 

[pve-devel] applied: [PATCH container] fix #4164: use DHCP=yes instead of DHCP=both in systemd-networkd config

[Wolfgang Bumiller]

On Tue, Jul 19, 2022 at 01:54:50PM +0200, Oguz Bektas wrote:
> On Tue, Jul 19, 2022 at 01:52:37PM +0200, Fabian Grünbichler wrote:
> > On July 19, 2022 1:24 pm, Oguz Bektas wrote:
> > > "both" option is deprecated, this gets rid of the warning in the journal
> > > 
> > > Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> > 
> > some notion which templates you tested this with, when the deprecation 
> > happened in systemd, whether we need a fallback to 'both' for older 
> > versions, etc.pp. would be nice to have..
> > 
> > AFAICT the deprecation was in systemd v219, so should probably be okay 
> > to switch unconditionally..
> 
> yes, all our current templates are using the newer systemd versions, so
> no need for a fallback IMO.
> 
> i tested it with:
> * arch
> * fedora 35 and 36
> * ubuntu 20 and 22
> templates, it got rid of the warning in all of them.

Introduced in 2015 is old enough. Anybody using a container which
actually uses systemd-networkd *and* is that old will just have to
enable dhcp manually...

Applied.

Re: [pve-devel] applied: [PATCH container] fix #4164: use DHCP=yes instead of DHCP=both in systemd-networkd config

[Thomas Lamprecht]

Am 22/07/2022 um 14:50 schrieb Wolfgang Bumiller:
> On Tue, Jul 19, 2022 at 01:54:50PM +0200, Oguz Bektas wrote:
>> On Tue, Jul 19, 2022 at 01:52:37PM +0200, Fabian Grünbichler wrote:
>>> On July 19, 2022 1:24 pm, Oguz Bektas wrote:
>>>> "both" option is deprecated, this gets rid of the warning in the journal
>>>>
>>>> Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
>>>
>>> some notion which templates you tested this with, when the deprecation 
>>> happened in systemd, whether we need a fallback to 'both' for older 
>>> versions, etc.pp. would be nice to have..
>>>
>>> AFAICT the deprecation was in systemd v219, so should probably be okay 
>>> to switch unconditionally..
>>
>> yes, all our current templates are using the newer systemd versions, so
>> no need for a fallback IMO.
>>
>> i tested it with:
>> * arch
>> * fedora 35 and 36
>> * ubuntu 20 and 22
>> templates, it got rid of the warning in all of them.
> 
> Introduced in 2015 is old enough. Anybody using a container which
> actually uses systemd-networkd *and* is that old will just have to
> enable dhcp manually...
> 
> Applied.

Why not use the already available get_systemd_version helper though?
If it wasn't available I could relate to why one wouldn't like to bother with
adding one for this specific situation, but we already got it, so adding an
automatic fallback would be for free.