diff --git a/1006-Do-not-flush-default-config-after-installation.patch b/1006-Do-not-flush-default-config-after-installation.patch new file mode 100644 index 0000000000000000000000000000000000000000..ce4a9b64085fd2ec3ef9c4da91d0404e5b4841ed --- /dev/null +++ b/1006-Do-not-flush-default-config-after-installation.patch @@ -0,0 +1,25 @@ +From 08ac3c8c1add5d56f249a4515e9cfe8ae458d1bc Mon Sep 17 00:00:00 2001 +From: "taifu.gc" +Date: Mon, 3 Jun 2024 03:31:16 +0000 +Subject: [PATCH] fid + +--- + pyanaconda/modules/storage/bootloader/grub2.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyanaconda/modules/storage/bootloader/grub2.py b/pyanaconda/modules/storage/bootloader/grub2.py +index 9641add..08359bc 100644 +--- a/pyanaconda/modules/storage/bootloader/grub2.py ++++ b/pyanaconda/modules/storage/bootloader/grub2.py +@@ -366,7 +366,7 @@ class GRUB2(BootLoader): + # now tell grub2 to generate the main configuration file + rc = util.execWithRedirect( + "grub2-mkconfig", +- ["-o", self.config_file], ++ ["-o", self.config_file, "--no-grubenv-update"], + root=conf.target.system_root + ) + if rc: +-- +2.39.3 + diff --git a/anaconda.spec b/anaconda.spec index bc5d8a1e4fbb8d694494b20a2eb176ed2f62c906..32ddf9403067a5b975f74259d19f498908c56829 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,4 +1,4 @@ -%define anolis_release 5 +%define anolis_release 6 Summary: Graphical system installer Name: anaconda @@ -25,6 +25,7 @@ Patch1002: 1002-Set-the-default-timezone-to-Shanghai.patch Patch1003: 1003-delete-the-other-languages.patch Patch1004: 1004-add-os-repo-in-default-repo-list.patch Patch1005: 1005-add-loongarch64-support-for-anaconda-38.23.patch +Patch1006: 1006-Do-not-flush-default-config-after-installation.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -445,6 +446,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Jun 3 2024 Chang Gao - 38.23-6 +- Do not flust default config override grubby config by kernel + * Mon Mar 11 2024 Bo Ren - 38.23-5 - Rebuild with python3.11