From b53702a71b46e1cfc0b1275f601c5c13ffd2c545 Mon Sep 17 00:00:00 2001 From: sun_hai_10 Date: Thu, 1 Dec 2022 09:03:10 +0800 Subject: [PATCH] change rescue parameter with new anaconda --- ...e-rescue-parameter-with-new-anaconda.patch | 39 +++++++++++++++++++ oemaker.spec | 8 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0012-change-rescue-parameter-with-new-anaconda.patch diff --git a/0012-change-rescue-parameter-with-new-anaconda.patch b/0012-change-rescue-parameter-with-new-anaconda.patch new file mode 100644 index 0000000..7ea0578 --- /dev/null +++ b/0012-change-rescue-parameter-with-new-anaconda.patch @@ -0,0 +1,39 @@ +From 8a67d38e533dbbe114e4f7ca51fb24a854176239 Mon Sep 17 00:00:00 2001 +From: sun_hai_10 +Date: Tue, 29 Nov 2022 14:22:17 +0800 +Subject: [PATCH] change rescue parameter with new anaconda + +--- + isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 2 +- + isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg +index 2d165e1..2cc19a8 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@ 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 + 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 fe2bc03..c7cb824 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@ rescue fpi_to_tail=off ++ linuxefi @KERNELPATH@ @ROOT@ inst.rescue fpi_to_tail=off + initrdefi @INITRDPATH@ + } + } +-- +2.23.0 + diff --git a/oemaker.spec b/oemaker.spec index bada3ce..4d26cec 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management Version: 2.0.4 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -34,6 +34,7 @@ Patch0005: 0005-add-fpi_tail-param-for-grub.patch Patch0008: 0008-add-parse_everything_deb_exclude.patch Patch0010: 0010-do-not-cleanup-pkg.patch Patch0011: 0011-support-desktop-iso.patch +Patch0012: 0012-change-rescue-parameter-with-new-anaconda.patch %description a building tool for DVD ISO making and ISO cutting @@ -141,6 +142,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Tue Nov 29 2022 sunhai - 2.0.4-2 +- ID:NA +- SUG:NA +- DESC: change rescue parameter with new anaconda + * Tue Nov 22 2022 xiangyuning - 2.0.4-1 - ID:NA - SUG:NA