From 406f872ff32c55dbb94801ae5626b93892f9a695 Mon Sep 17 00:00:00 2001 From: Wei Jiangang Date: Mon, 26 Aug 2024 19:04:00 +0800 Subject: [PATCH] Fix ID that does not meet standards. the ID should be a lower-case string and keep consistent with other versions, such as ID=centos, ID=ubuntu. refer to https://www.freedesktop.org/software/systemd/man/latest/os-release.html For more details about this problem, The wrong ID=openEuler leads to the failure of guestfs command, such as check_tests: checking /etc/os-release chroot: /sysroot: running 'is_file: /etc/os-release' chroot: /sysroot: running 'parse_os_release' /etc/os-release: unknown ID=openEuler parse_version_from_major_minor: parsing '24.03' check_tests: checking /etc/lsb-release Signed-off-by: Wei Jiangang Signed-off-by: Wei Jiangang --- generic-release.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index 8c9482c..0b2fb14 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 54 +%define generic_release 55 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -47,10 +47,11 @@ echo "%{product_family} release %{generic_version} (%{generic_patch_level})" > $ ln -sf %{product_family}-release $RPM_BUILD_ROOT/etc/system-release # create /etc/os-release +%define minimized_id `echo %{product_family} | tr '[:upper:]' '[:lower:]'` cat << EOF >>$RPM_BUILD_ROOT/etc/os-release NAME="%{product_family}" VERSION="%{generic_version} (%{generic_patch_level})" -ID="%{product_family}" +ID="%{minimized_id}" VERSION_ID="%{generic_version}" PRETTY_NAME="%{product_family} %{generic_version} (%{generic_patch_level})" ANSI_COLOR="0;31" @@ -126,6 +127,9 @@ fi /usr/share/eula/eula.* %changelog +* Mon Aug 26 2024 Wei Jiangang - 1.0-55 +- Fix wrong ID that does not meet standards + * Tue May 28 2024 liyanan - 1.0-54 - Delete Processes print -- Gitee