From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 01C3B60EEF for ; Mon, 19 Oct 2020 21:12:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E49422F395 for ; Mon, 19 Oct 2020 21:12:19 +0200 (CEST) Received: from server2.johndoe666.info (server2.johndoe666.info [95.85.50.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4E5CB2F38B for ; Mon, 19 Oct 2020 21:12:18 +0200 (CEST) Received: by server2.johndoe666.info (Postfix, from userid 109) id C5E0543264; Mon, 19 Oct 2020 19:06:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on server2.johndoe666.info X-Spam-Status: No, score=-102.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.5-pre1 X-Spam-AuthCookie: johndoe666.info:05e947ec98ed30fed23b5b5e38dcfd86d0e30c5e Received: from mailsrv.office.adreyer.com (mailsrv [192.0.2.246]) by server2.johndoe666.info (Postfix) with ESMTP id 4436A402A0; Mon, 19 Oct 2020 19:06:57 +0000 (UTC) Authentication-Results: mail.johndoe666.info; dmarc=none (p=none dis=none) header.from=adreyer.com Received: from webmail.office.adreyer.com (webmail.office.adreyer.com [192.168.1.61]) by mailsrv.office.adreyer.com (Postfix) with ESMTPSA id DAF601F4C8; Mon, 19 Oct 2020 19:06:56 +0000 (UTC) MIME-Version: 1.0 Date: Mon, 19 Oct 2020 19:06:56 +0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Mailer: RainLoop/1.14.0 From: "Achim Dreyer (proxmox)" Message-ID: <1ab72fca0d3c3585331734dcfab892dd@adreyer.com> To: "Thomas Lamprecht" , "Proxmox VE development discussion" , "Achim Dreyer" In-Reply-To: <2caf3f2a-26b9-aef6-2595-6032afec66e3@proxmox.com> References: <2caf3f2a-26b9-aef6-2595-6032afec66e3@proxmox.com> <20201017134556.2871759-1-ml11045@adreyer.com> <20201017134556.2871759-2-ml11045@adreyer.com> X-SPAM-LEVEL: Spam detection results: 2 AWL 0.876 Adjusted score from AWL reputation of From: address JMQ_SPF_NEUTRAL 0.5 SPF set to ?all KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_ILLEGAL_IP 1.3 Received: contains illegal IP address SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] SPAM: [PATCH v2 container 1/1] Fix numbering scheme detection for CentOS Stream releases. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Oct 2020 19:12:50 -0000 Hi,=0A=0AOn a fully patched CentOS 8 stream box I get only the major rele= ase number. The whole purpose of=0Athe stream system is that there are no= minor versions and all packages are directly going into the=0Amajor vers= ion for continuous delivery..=0A=0Aroot@ansible:~# rpm -ql centos-stream-= release=0A/etc/centos-release=0A/etc/issue=0A/etc/issue.net=0A/etc/os-rel= ease=0A/etc/redhat-release=0A/etc/rpm/macros.dist=0A/etc/system-release= =0A/etc/system-release-cpe=0A/usr/lib/os-release=0A/usr/lib/systemd/syste= m-preset/85-display-manager.preset=0A/usr/lib/systemd/system-preset/90-de= fault.preset=0A/usr/lib/systemd/system-preset/99-default-disable.preset= =0A/usr/share/centos-release=0A/usr/share/centos-release/EULA=0A/usr/shar= e/doc/centos-stream-release=0A/usr/share/doc/centos-stream-release/Contri= butors=0A/usr/share/licenses/centos-stream-release=0A/usr/share/licenses/= centos-stream-release/LICENSE=0A/usr/share/redhat-release=0Aroot@ansible:= ~# rpm -qi centos-stream-release=0AName : centos-stream-release=0AVersion= : 8.3=0ARelease : 1.el8=0AArchitecture: noarch=0AInstall Date: Wed Sep 3= 0 09:50:02 2020=0AGroup : Unspecified=0ASize : 25312=0ALicense : GPLv2=0A= Signature : RSA/SHA256, Tue Sep 15 20:39:01 2020, Key ID 05b555b38483c65d= =0ASource RPM : centos-stream-release-8.3-1.el8.src.rpm=0ABuild Date : Tu= e Sep 15 20:33:35 2020=0ABuild Host : aarch64-04.mbox.centos.org=0AReloca= tions : (not relocatable)=0APackager : CentOS Buildsys = =0AVendor : CentOS=0AURL : https://centos.org=0ASummary : CentOS Stream r= elease files=0ADescription :=0ACentOS Stream release files.=0Aroot@ansibl= e:~# cat /etc/redhat-release =0ACentOS Stream release 8=0Aroot@ansible:~#= cat /etc/centos-release =0ACentOS Stream release 8=0A=0A=0A-Achim=0A=0A= =0AOctober 19, 2020 1:25 PM, "Thomas Lamprecht" = wrote:=0A=0A> On 17.10.20 15:45, Achim Dreyer wrote:=0A> =0A>> Signed-of= f-by: Achim Dreyer =0A>> ---=0A>> src/PVE/LXC/Setup/= CentOS.pm | 2 +-=0A>> 1 file changed, 1 insertion(+), 1 deletion(-)=0A>> = =0A>> diff --git a/src/PVE/LXC/Setup/CentOS.pm b/src/PVE/LXC/Setup/CentOS= .pm=0A>> index 0825273..77eb6f7 100644=0A>> --- a/src/PVE/LXC/Setup/CentO= S.pm=0A>> +++ b/src/PVE/LXC/Setup/CentOS.pm=0A>> @@ -19,7 +19,7 @@ sub ne= w {=0A>> =0A>> my $version;=0A>> =0A>> - if ($release =3D~ m/release\s+(\= d+\.\d+)(\.\d+)?/) {=0A>> + if (($release =3D~ m/release\s+(\d+\.\d+)(\.\= d+)?/) || ($release =3D~ m/release\s+(\d+)/)) {=0A>> if ($1 >=3D 5 && $1 = <=3D 9) {=0A>> $version =3D $1;=0A>> }=0A> =0A> Patch and organizational = stuff looks OK, but can you please tell me what the=0A> issue was with th= e original code?=0A> =0A> A CentOS 8 Stream template from the LXC repo[0]= shows the following redhat-release (linked=0A> to centos-release) file c= ontent:=0A>> CentOS Linux release 8.2.2004 (Core)=0A> =0A> and would matc= h the original regex.=0A> =0A> What do the release files making problems = here look like?=0A> =0A> Would be good to have some rationale with what/w= hy we can expect here, as if I had to=0A> guess it's looking like `.` but that would not had=0A> triggered you se= nding this patch, I guess.=0A> =0A> cheers,=0A> Thomas=0A> =0A> [0]:=0A> = https://uk.images.linuxcontainers.org/images/centos/8-Stream/amd64/defaul= t/20201019_07:44/?C=3DS;O=3DA