Correct grammar in Grub rescue menu entries #1

Merged
eabdullin merged 1 commits from ykohut/lorax-templates-almalinux:a10s into a10s 2025-04-02 12:00:25 +00:00
2 changed files with 89 additions and 1 deletions

View File

@ -0,0 +1,81 @@
From fc22aa6b6911ef497e1efc1e4523840ca21d000f Mon Sep 17 00:00:00 2001
From: Yuriy Kohut <yura.kohut@gmail.com>
Date: Tue, 1 Apr 2025 17:16:18 +0300
Subject: [PATCH] Correct grammar in Grub rescue menu entries
---
80-rhel/config_files/aarch64/grub2-efi.cfg | 2 +-
80-rhel/config_files/ppc/grub.cfg.in | 2 +-
80-rhel/config_files/x86/grub2-bios.cfg | 2 +-
80-rhel/config_files/x86/grub2-efi.cfg | 2 +-
80-rhel/config_files/x86/isolinux.cfg | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/80-rhel/config_files/aarch64/grub2-efi.cfg b/80-rhel/config_files/aarch64/grub2-efi.cfg
index 1ce5d33..96dc867 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@ nomodeset
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 1b14ede..8fe0731 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-bios.cfg b/80-rhel/config_files/x86/grub2-bios.cfg
index cfca1bf..3eaf3a0 100644
--- a/80-rhel/config_files/x86/grub2-bios.cfg
+++ b/80-rhel/config_files/x86/grub2-bios.cfg
@@ -30,7 +30,7 @@ submenu 'Troubleshooting -->' {
linux @KERNELPATH@ @ROOT@ nomodeset quiet
initrd @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 {
linux @KERNELPATH@ @ROOT@ inst.rescue quiet
initrd @INITRDPATH@
}
diff --git a/80-rhel/config_files/x86/grub2-efi.cfg b/80-rhel/config_files/x86/grub2-efi.cfg
index 8c9adad..2468a06 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@ nomodeset 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 216d36f..034fce4 100644
--- a/80-rhel/config_files/x86/isolinux.cfg
+++ b/80-rhel/config_files/x86/isolinux.cfg
@@ -87,7 +87,7 @@ label basic
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.
--
2.43.0

View File

@ -1,6 +1,6 @@
Name: lorax-templates-almalinux
Version: 10.0
Release: 56%{?dist}.alma.1
Release: 56%{?dist}.alma.2
Summary: AlmaLinux 10 build templates for lorax and livemedia-creator
License: GPLv2+
@ -17,6 +17,8 @@ Requires: lorax >= 34.9.1
Provides: lorax-templates = %{version}-%{release}
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
@ -27,6 +29,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
@ -44,6 +48,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
%{templatedir}/*
%changelog
* Wed Apr 02 2025 Yuriy Kohut <ykohut@almalinux.org> - 10.0-56.alma.2
- Correct grammar in Grub rescue menuentries
* Wed Mar 12 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-56.alma.1
- runtime-cleanup: Leave the stat binary (bcl)