!94 add fpi_tail for grub2
Merge pull request !94 from gitee_cmd/openEuler-20.03-LTS-SP3
This commit is contained in:
openeuler-ci-bot
Gitee
commit
5939cac518
71
0005-add-fpi_tail-param-for-grub.patch
Normal file
71
0005-add-fpi_tail-param-for-grub.patch
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
From 3b813b13637065c76184f6e57d0fa76d2571b1ca Mon Sep 17 00:00:00 2001
|
||||||
|
From: gitee-cmd <chemingdao@huawei.com>
|
||||||
|
Date: Fri, 31 Dec 2021 15:11:32 +0800
|
||||||
|
Subject: [PATCH] add fpi_tail param for grub
|
||||||
|
|
||||||
|
---
|
||||||
|
isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg | 8 ++++----
|
||||||
|
isomaker/80-openeuler/config_files/x86/grub2-efi.cfg | 8 ++++----
|
||||||
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg
|
||||||
|
index 43b0e74..2d165e1 100644
|
||||||
|
--- a/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg
|
||||||
|
+++ b/isomaker/80-openeuler/config_files/aarch64/grub2-efi.cfg
|
||||||
|
@@ -27,20 +27,20 @@ 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.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me
|
||||||
|
+ linux @KERNELPATH@ @ROOT@ ro inst.geoloc=0 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@
|
||||||
|
}
|
||||||
|
menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
|
||||||
|
- linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me
|
||||||
|
+ linux @KERNELPATH@ @ROOT@ rd.live.check inst.geoloc=0 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@
|
||||||
|
}
|
||||||
|
submenu 'Troubleshooting -->' {
|
||||||
|
menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class red --class gnu-linux --class gnu --class os {
|
||||||
|
- linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 console=tty0 smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 video=efifb:off video=VGA-1:640x480-32@60me
|
||||||
|
+ linux @KERNELPATH@ @ROOT@ nomodeset inst.geoloc=0 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@
|
||||||
|
}
|
||||||
|
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
|
||||||
|
+ 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
|
||||||
|
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 5001156..fe2bc03 100644
|
||||||
|
--- a/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg
|
||||||
|
+++ b/isomaker/80-openeuler/config_files/x86/grub2-efi.cfg
|
||||||
|
@@ -21,20 +21,20 @@ search --no-floppy --set=root -l '@ISOLABEL@'
|
||||||
|
|
||||||
|
### BEGIN /etc/grub.d/10_linux ###
|
||||||
|
menuentry 'Install @PRODUCT@ @VERSION@' --class openEuler --class gnu-linux --class gnu --class os {
|
||||||
|
- linuxefi @KERNELPATH@ @ROOT@ quiet
|
||||||
|
+ linuxefi @KERNELPATH@ @ROOT@ fpi_to_tail=off
|
||||||
|
initrdefi @INITRDPATH@
|
||||||
|
}
|
||||||
|
menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class openEuler --class gnu-linux --class gnu --class os {
|
||||||
|
- linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet
|
||||||
|
+ linuxefi @KERNELPATH@ @ROOT@ rd.live.check fpi_to_tail=off
|
||||||
|
initrdefi @INITRDPATH@
|
||||||
|
}
|
||||||
|
submenu 'Troubleshooting -->' {
|
||||||
|
menuentry 'Install @PRODUCT@ @VERSION@ in basic graphics mode' --class openEuler --class gnu-linux --class gnu --class os {
|
||||||
|
- linuxefi @KERNELPATH@ @ROOT@ nomodeset quiet
|
||||||
|
+ linuxefi @KERNELPATH@ @ROOT@ nomodeset fpi_to_tail=off
|
||||||
|
initrdefi @INITRDPATH@
|
||||||
|
}
|
||||||
|
menuentry 'Rescue a @PRODUCT@ system' --class openEuler --class gnu-linux --class gnu --class os {
|
||||||
|
- linuxefi @KERNELPATH@ @ROOT@ rescue quiet
|
||||||
|
+ linuxefi @KERNELPATH@ @ROOT@ rescue fpi_to_tail=off
|
||||||
|
initrdefi @INITRDPATH@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ Summary: a duilding tool for DVD ISO making and ISO cutting
|
|||||||
License: Mulan PSL v2
|
License: Mulan PSL v2
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Version: 2.0.3
|
Version: 2.0.3
|
||||||
Release: 1
|
Release: 2
|
||||||
BuildRoot: %{_tmppath}/%{name}
|
BuildRoot: %{_tmppath}/%{name}
|
||||||
|
|
||||||
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
@ -28,7 +28,7 @@ Patch0001: 0001-rename-source-iso.patch
|
|||||||
Patch0002: 0002-bugfix-I3QY98.patch
|
Patch0002: 0002-bugfix-I3QY98.patch
|
||||||
Patch0003: 0003-change-for-edge-computing.patch
|
Patch0003: 0003-change-for-edge-computing.patch
|
||||||
Patch0004: 0004-bugfix-I3OGUT.patch
|
Patch0004: 0004-bugfix-I3OGUT.patch
|
||||||
|
Patch0005: 0005-add-fpi_tail-param-for-grub.patch
|
||||||
%description
|
%description
|
||||||
a building tool for DVD ISO making and ISO cutting
|
a building tool for DVD ISO making and ISO cutting
|
||||||
|
|
||||||
@ -129,6 +129,11 @@ rm -rf %{buildroot}
|
|||||||
rm -rf $RPM_BUILD_DIR/%{name}
|
rm -rf $RPM_BUILD_DIR/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 28 2021 chemingdao <chemingdao@huawei.com> - 2.0.3-2
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC: add fpi_tail param for grub2
|
||||||
|
|
||||||
* Tue Dec 28 2021 xinsheng3 <xinsheng3@huawei.com> - 2.0.3-1
|
* Tue Dec 28 2021 xinsheng3 <xinsheng3@huawei.com> - 2.0.3-1
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user