Hi, On a fully patched CentOS 8 stream box I get only the major release number. The whole purpose of the stream system is that there are no minor versions and all packages are directly going into the major version for continuous delivery..
root@ansible:~# rpm -ql centos-stream-release /etc/centos-release /etc/issue /etc/issue.net /etc/os-release /etc/redhat-release /etc/rpm/macros.dist /etc/system-release /etc/system-release-cpe /usr/lib/os-release /usr/lib/systemd/system-preset/85-display-manager.preset /usr/lib/systemd/system-preset/90-default.preset /usr/lib/systemd/system-preset/99-default-disable.preset /usr/share/centos-release /usr/share/centos-release/EULA /usr/share/doc/centos-stream-release /usr/share/doc/centos-stream-release/Contributors /usr/share/licenses/centos-stream-release /usr/share/licenses/centos-stream-release/LICENSE /usr/share/redhat-release root@ansible:~# rpm -qi centos-stream-release Name : centos-stream-release Version : 8.3 Release : 1.el8 Architecture: noarch Install Date: Wed Sep 30 09:50:02 2020 Group : Unspecified Size : 25312 License : GPLv2 Signature : RSA/SHA256, Tue Sep 15 20:39:01 2020, Key ID 05b555b38483c65d Source RPM : centos-stream-release-8.3-1.el8.src.rpm Build Date : Tue Sep 15 20:33:35 2020 Build Host : aarch64-04.mbox.centos.org Relocations : (not relocatable) Packager : CentOS Buildsys <b...@centos.org> Vendor : CentOS URL : https://centos.org Summary : CentOS Stream release files Description : CentOS Stream release files. root@ansible:~# cat /etc/redhat-release CentOS Stream release 8 root@ansible:~# cat /etc/centos-release CentOS Stream release 8 -Achim October 19, 2020 1:25 PM, "Thomas Lamprecht" <t.lampre...@proxmox.com> wrote: > On 17.10.20 15:45, Achim Dreyer wrote: > >> Signed-off-by: Achim Dreyer <ml11...@adreyer.com> >> --- >> src/PVE/LXC/Setup/CentOS.pm | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/src/PVE/LXC/Setup/CentOS.pm b/src/PVE/LXC/Setup/CentOS.pm >> index 0825273..77eb6f7 100644 >> --- a/src/PVE/LXC/Setup/CentOS.pm >> +++ b/src/PVE/LXC/Setup/CentOS.pm >> @@ -19,7 +19,7 @@ sub new { >> >> my $version; >> >> - if ($release =~ m/release\s+(\d+\.\d+)(\.\d+)?/) { >> + if (($release =~ m/release\s+(\d+\.\d+)(\.\d+)?/) || ($release =~ >> m/release\s+(\d+)/)) { >> if ($1 >= 5 && $1 <= 9) { >> $version = $1; >> } > > Patch and organizational stuff looks OK, but can you please tell me what the > issue was with the original code? > > A CentOS 8 Stream template from the LXC repo[0] shows the following > redhat-release (linked > to centos-release) file content: >> CentOS Linux release 8.2.2004 (Core) > > and would match the original regex. > > What do the release files making problems here look like? > > Would be good to have some rationale with what/why we can expect here, as if > I had to > guess it's looking like `<CentOS-base-version>.<year-month>` but that would > not had > triggered you sending this patch, I guess. > > cheers, > Thomas > > [0]: > https://uk.images.linuxcontainers.org/images/centos/8-Stream/amd64/default/20201019_07:44/?C=S;O=A _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
