From 952e5361b878ddc5b99ac0ba1298a72c535e7db5 Mon Sep 17 00:00:00 2001 From: wangzhe Date: Wed, 10 Apr 2024 14:59:00 +0800 Subject: [PATCH] Revert commit b340080 for an8.9, anck no longer needs this change Signed-off-by: wangzhe --- 98-kdump-repos.ks | 10 ---------- anaconda.spec | 9 ++++----- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 98-kdump-repos.ks diff --git a/98-kdump-repos.ks b/98-kdump-repos.ks deleted file mode 100644 index 50a09ea..0000000 --- a/98-kdump-repos.ks +++ /dev/null @@ -1,10 +0,0 @@ - -%post - -if [[ ! `rpm -qa|grep kernel-core` =~ "kernel-core-4.18".* ]];then - grubby --args=crashkernel=0M-2G:0M,2G-8G:192M,8G-:256M --update-kernel /boot/vmlinuz-*.an8* -fi - -%end - - diff --git a/anaconda.spec b/anaconda.spec index 09d279b..1e73b10 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.9 +%define anolis_release .0.10 Summary: Graphical system installer Name: anaconda Version: 33.16.6.7 @@ -12,7 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # ./autogen.sh # make dist Source0: %{name}-%{version}.tar.bz2 -Source1: 98-kdump-repos.ks # Begin of Anolis patches Patch0001: 0001-install-rebrand-to-anolis.patch @@ -290,9 +289,6 @@ find %{buildroot} -type f -name "*.la" | xargs %{__rm} # Create an empty directory for addons mkdir %{buildroot}%{_datadir}/anaconda/addons -# Create an empty directory for post-scripts -cp %{SOURCE1} %{buildroot}%{_datadir}/anaconda/post-scripts - # required for live installations desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/liveinst.desktop @@ -383,6 +379,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Apr 10 2024 wangzhe - 33.16.6.7-1.0.10 +- Revert commit b340080 for an8.9, anck no longer needs this change + * Mon Jan 28 2023 Chang Gao - 33.16.6.7-1.0.9 - Reconfig kdump param by using grubby to keep #aone45392833 change -- Gitee