From 0a5b38de9bc09bdcbddd5950cce7a92bbb8f08e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E4=BB=B2=E4=BC=9F?= Date: Wed, 4 Dec 2024 16:56:50 +0800 Subject: [PATCH] Set the default language environment for rescue mode to en_US.UTF-8 --- ...language-environment-for-rescue-mode.patch | 67 +++++++++++++++++++ oemaker.spec | 9 ++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 0001-Set-the-default-language-environment-for-rescue-mode.patch diff --git a/0001-Set-the-default-language-environment-for-rescue-mode.patch b/0001-Set-the-default-language-environment-for-rescue-mode.patch new file mode 100644 index 0000000..2f378a5 --- /dev/null +++ b/0001-Set-the-default-language-environment-for-rescue-mode.patch @@ -0,0 +1,67 @@ +From db73165fae14cffbffc4b1746cb6bb07b760daac Mon Sep 17 00:00:00 2001 +From: shenzhongwei +Date: Tue, 5 Nov 2024 18:00:28 +0800 +Subject: [PATCH] Set the default language environment for rescue mode to en_US.UTF-8 + +--- + isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 2 +- + isomaker/80-openeuler/config_files/loongarch64/grub2-efi.cfg | 2 +- + isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 2 +- + isomaker/80-openeuler/config_files/x86/isolinux.cfg | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg +index 2cc19a8..a33796f 100644 +--- a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg ++++ b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg +@@ -40,7 +40,7 @@ submenu 'Troubleshooting -->' { + initrd @INITRDPATH@ + } + menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ inst.rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off ++ linux @KERNELPATH@ @ROOT@ inst.rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me fpi_to_tail=off inst.lang=en_US.UTF-8 + initrd @INITRDPATH@ + } + } +diff --git a/isomaker/80-openeuler/config_files/loongarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/loongarch64/grub2-efi.cfg +index 37ca171..81a47a4 100644 +--- a/isomaker/80-openeuler/config_files/loongarch64/grub2-efi.cfg ++++ b/isomaker/80-openeuler/config_files/loongarch64/grub2-efi.cfg +@@ -41,7 +41,7 @@ submenu 'Troubleshooting -->' { + initrd @INITRDPATH@ + } + menuentry 'Rescue the @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { +- linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off fpi_to_tail=off ++ linux @KERNELPATH@ @ROOT@ rescue console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off fpi_to_tail=off inst.lang=en_US.UTF-8 + initrd @INITRDPATH@ + } + } +diff --git a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg +index c7cb824..21040ca 100644 +--- a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg ++++ b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg +@@ -34,7 +34,7 @@ submenu 'Troubleshooting -->' { + initrdefi @INITRDPATH@ + } + menuentry 'Rescue a @PRODUCT@ system' --class openEuler --class gnu-linux --class gnu --class os { +- linuxefi @KERNELPATH@ @ROOT@ inst.rescue fpi_to_tail=off ++ linuxefi @KERNELPATH@ @ROOT@ inst.rescue fpi_to_tail=off inst.lang=en_US.UTF-8 + initrdefi @INITRDPATH@ + } + } +diff --git a/isomaker/80-openeuler/config_files/x86/isolinux.cfg b/isomaker/80-openeuler/config_files/x86/isolinux.cfg +index 7a54308..a944f9a 100644 +--- a/isomaker/80-openeuler/config_files/x86/isolinux.cfg ++++ b/isomaker/80-openeuler/config_files/x86/isolinux.cfg +@@ -93,7 +93,7 @@ label rescue + and edit config files to try to get it booting again. + endtext + kernel vmlinuz +- append initrd=initrd.img @ROOT@ inst.rescue quiet fpi_to_tail=off ++ append initrd=initrd.img @ROOT@ inst.rescue quiet fpi_to_tail=off inst.lang=en_US.UTF-8 + + label memtest + menu label Run a ^memory test +-- +2.27.0 + diff --git a/oemaker.spec b/oemaker.spec index c9041b7..b811e2a 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 3.2.0 -Release: 6 +Release: 7 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -30,6 +30,7 @@ Requires: lorax >= 19.6.78-1 # Patch here Patch0001: 0001-bugfix-IABY7K.patch +Patch0002: 0001-Set-the-default-language-environment-for-rescue-mode.patch %description a building tool for DVD ISO making and ISO cutting @@ -186,6 +187,12 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Wed Dec 04 2024 shenzhongwei - 3.2.0-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Set the default language environment for rescue mode to en_US.UTF-8 + * Wed Dec 4 2024 zhaolichang - 3.2.0-6 - ID:NA - SUG:NA -- Gitee