From b621944401f62492aa7a6e5c37c67581d4278f62 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Fri, 11 Nov 2022 11:26:52 +0800 Subject: [PATCH] fix release-custom uninstall error --- generic-release.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/generic-release.spec b/generic-release.spec index 1e2d5da..10667bf 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -6,7 +6,7 @@ %define generic_version 20.03 %define generic_patch_level LTS %define generic_patch_level_extend SP3 -%define generic_release 53 +%define generic_release 54 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -72,12 +72,17 @@ openeuler-release-custom %setup -q -n generic-release-%{builtin_release_version} %postun -n %{product_family}-release-custom -grep "%{boot_args}" /etc/grub.d/10_linux > /dev/null 2>&1 -if [ $? -ne 0 ]; then -echo "ERROR: failed to clean up boot args in /etc/grub.d/10_linux because they have been modified" -exit 1 +vendorid=`lscpu | grep "Vendor ID:" | awk '{print $3}'` +model=`lscpu | grep "Model:" | awk '{print $2}'` + +if [ "0x70" == "${vendorid}" -a "3" == "${model}" ]; then + grep "%{boot_args}" /etc/grub.d/10_linux > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "ERROR: failed to clean up boot args in /etc/grub.d/10_linux because they have been modified" + exit 1 + fi + sed -i "s/%{boot_args} //g" /etc/grub.d/10_linux fi -sed -i "s/%{boot_args} //g" /etc/grub.d/10_linux %posttrans -n %{product_family}-release-custom @@ -201,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT %files -n %{product_family}-release-custom %changelog +* Tue Nov 8 2022 liyanan - 1.0-54 +- fix release-custom uninstall error + * Tue Nov 8 2022 liyanan - 1.0-53 - sysconfig parameters have a impact on performance,comment out the relevant content -- Gitee