Apply 0001-Correct-grammar-in-Grub-rescue-menu-entries.patch #3

Merged
eabdullin merged 1 commits from ykohut/lorax-templates-almalinux:a9-beta into a9-beta 2025-04-02 11:25:10 +00:00
2 changed files with 60 additions and 1 deletions

View File

@ -0,0 +1,52 @@
diff --git a/80-rhel/config_files/aarch64/grub2-efi.cfg b/80-rhel/config_files/aarch64/grub2-efi.cfg
index 80db480..2b89973 100644
--- a/80-rhel/config_files/aarch64/grub2-efi.cfg
+++ b/80-rhel/config_files/aarch64/grub2-efi.cfg
@@ -39,7 +39,7 @@ submenu 'Troubleshooting -->' {
linux @KERNELPATH@ @ROOT@ inst.text
initrd @INITRDPATH@
}
- menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
+ menuentry 'Rescue an @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
linux @KERNELPATH@ @ROOT@ inst.rescue
initrd @INITRDPATH@
}
diff --git a/80-rhel/config_files/ppc/grub.cfg.in b/80-rhel/config_files/ppc/grub.cfg.in
index aa5f1dc..d4ad33d 100644
--- a/80-rhel/config_files/ppc/grub.cfg.in
+++ b/80-rhel/config_files/ppc/grub.cfg.in
@@ -13,7 +13,7 @@ menuentry "Test this media & install @PRODUCT@ @VERSION@ (64-bit kernel)" --cla
initrd /ppc/ppc64/initrd.img
}
-menuentry "Rescue a @PRODUCT@ system (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os {
+menuentry "Rescue an @PRODUCT@ system (64-bit kernel)" --class fedora --class gnu-linux --class gnu --class os {
linux /ppc/ppc64/vmlinuz @ROOT@ inst.rescue ro
initrd /ppc/ppc64/initrd.img
}
diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg
index 5fc47de..6c1e557 100644
--- a/80-rhel/config_files/x86/grub2-efi.cfg
+++ b/80-rhel/config_files/x86/grub2-efi.cfg
@@ -33,7 +33,7 @@ submenu 'Troubleshooting -->' {
linuxefi @KERNELPATH@ @ROOT@ inst.text quiet
initrdefi @INITRDPATH@
}
- menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os {
+ menuentry 'Rescue an @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os {
linuxefi @KERNELPATH@ @ROOT@ inst.rescue quiet
initrdefi @INITRDPATH@
}
diff --git a/80-rhel/config_files/x86/isolinux.cfg b/80-rhel/config_files/x86/isolinux.cfg
index 01bf0cd..6ed0893 100644
--- a/80-rhel/config_files/x86/isolinux.cfg
+++ b/80-rhel/config_files/x86/isolinux.cfg
@@ -87,7 +87,7 @@ label text
label rescue
menu indent count 5
- menu label ^Rescue a @PRODUCT@ system
+ menu label ^Rescue an @PRODUCT@ system
text help
If the system will not boot, this lets you access files
and edit config files to try to get it booting again.

View File

@ -1,6 +1,6 @@
Name: lorax-templates-almalinux
Version: 9.6
Release: 2%{?dist}
Release: 2%{?dist}.1
Summary: AlmaLinux 9 build templates for lorax and livemedia-creator
License: GPLv2+
@ -11,6 +11,8 @@ Source0: lorax-templates-rhel-9.6-2.tar.gz
# Required for the template branding support
Requires: lorax >= 34.9.1
Patch0001: 0001-Correct-grammar-in-Grub-rescue-menu-entries.patch
# Where are these supposed to end up?
%define templatedir %{_datadir}/lorax/templates.d/70-almalinux
@ -21,6 +23,8 @@ placed in %{templatedir}
%prep
%setup -n lorax-templates-rhel-%{version}
%%patch0001 -p1
# Do not try to install packages not available in AlmaLinux
sed -i '/libreport-rhel-anaconda-bugzilla/d' 80-rhel/runtime-install.tmpl
sed -i '/redhat-release-eula/d' 80-rhel/runtime-install.tmpl
@ -38,6 +42,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
%{templatedir}/*
%changelog
* Wed Apr 02 2025 Yuriy Kohut <ykohut@almalinux.org> - 9.6-2.1
- Correct grammar in Grub rescue menuentries
* Fri Mar 21 2025 Eduard Abdullin <alukoshko@almalinux.org> - 9.6-2
- Update for AlmaLinux 9.6 beta