From 22f301e45dc6130cd8b84c3d11c1eca6fed7b878 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Fri, 1 Nov 2024 06:15:28 +0000 Subject: [PATCH] add systemd.unified_cgroup_hierarchy=0 for loongarch64 --- ...ied_cgroup_hierarchy-0-for-loongarch.patch | 36 +++++++++++++++++++ lorax-templates-anolis.spec | 6 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 1021-add-systemd.unified_cgroup_hierarchy-0-for-loongarch.patch diff --git a/1021-add-systemd.unified_cgroup_hierarchy-0-for-loongarch.patch b/1021-add-systemd.unified_cgroup_hierarchy-0-for-loongarch.patch new file mode 100644 index 0000000..60bcd3c --- /dev/null +++ b/1021-add-systemd.unified_cgroup_hierarchy-0-for-loongarch.patch @@ -0,0 +1,36 @@ +From 37c76bda532193354deb0c77dfa643ee1408094d Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Fri, 1 Nov 2024 06:06:47 +0000 +Subject: [PATCH] add systemd.unified_cgroup_hierarchy=0 for loongarch64 + +--- + 80-anolis/config_files/loongarch64/grub2-efi.cfg | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/80-anolis/config_files/loongarch64/grub2-efi.cfg b/80-anolis/config_files/loongarch64/grub2-efi.cfg +index acede09..162761f 100644 +--- a/80-anolis/config_files/loongarch64/grub2-efi.cfg ++++ b/80-anolis/config_files/loongarch64/grub2-efi.cfg +@@ -27,16 +27,16 @@ search --no-floppy --set=root -l '@ISOLABEL@' + + ### BEGIN /etc/grub.d/10_linux ### + menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis inst.xtimeout=1200 ++ linux @KERNELPATH@ @ROOT@ ro inst.profile=anolis inst.xtimeout=1200 systemd.unified_cgroup_hierarchy=0 + initrd @INITRDPATH@ + } + menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis inst.xtimeout=1200 ++ linux @KERNELPATH@ @ROOT@ rd.live.check inst.profile=anolis inst.xtimeout=1200 systemd.unified_cgroup_hierarchy=0 + initrd @INITRDPATH@ + } + submenu 'Troubleshooting -->' { + menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis inst.xtimeout=1200 ++ linux @KERNELPATH@ @ROOT@ nomodeset inst.profile=anolis inst.xtimeout=1200 systemd.unified_cgroup_hierarchy=0 + initrd @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +-- +2.41.0 + diff --git a/lorax-templates-anolis.spec b/lorax-templates-anolis.spec index 2607080..902cf5d 100644 --- a/lorax-templates-anolis.spec +++ b/lorax-templates-anolis.spec @@ -1,4 +1,4 @@ -%define anolis_release 23 +%define anolis_release 24 Name: lorax-templates-anolis Version: 37.0 @@ -32,6 +32,7 @@ Patch1017: 1017-add-ls2k500sfb.ko-for-loongarch64.patch Patch1018: 1018-Set-data-source-for-EFI-System-Partition-on-loongarch64.patch Patch1019: 1019-add-inst.xtimeout-1200.patch Patch1020: 1020-enable-systemd-resolved-by-default.patch +Patch1021: 1021-add-systemd.unified_cgroup_hierarchy-0-for-loongarch.patch # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-anolis @@ -56,6 +57,9 @@ cp -a 80-anolis/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Fri Nov 1 2024 Wenlong Zhang - 37.0-1.24 +- add systemd.unified_cgroup_hierarchy=0 for loongarch64 + * Wed Oct 30 2024 Chang Gao - 37.0-1.23 - Enable systemd-resolved by default. Resolve: #5859 -- Gitee