diff --git a/0285-BLS-create-etc-kernel-cmdline-during-mkconfig.patch b/0285-BLS-create-etc-kernel-cmdline-during-mkconfig.patch new file mode 100644 index 0000000..8d7405e --- /dev/null +++ b/0285-BLS-create-etc-kernel-cmdline-during-mkconfig.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Tue, 2 Aug 2022 15:56:28 -0400 +Subject: [PATCH] BLS: create /etc/kernel/cmdline during mkconfig + +Signed-off-by: Robbie Harwood +(cherry picked from commit 0837dcdf17ac0429bafa4dbf063b2a94385c04ca) +--- + util/grub.d/10_linux.in | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 6ee0a2cf3d..ec529eb814 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -166,6 +166,12 @@ update_bls_cmdline() + local cmdline="root=${LINUX_ROOT_DEVICE} ro ${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + local -a files=($(get_sorted_bls)) + ++ if [[ ! -f /etc/kernel/cmdline ]]; then ++ # anaconda has the correct information to do this during install; ++ # afterward, grubby will take care of syncing on updates. ++ echo "$cmdline rhgb quiet" > /etc/kernel/cmdline ++ fi ++ + for bls in "${files[@]}"; do + local options="${cmdline}" + if [ -z "${bls##*debug*}" ]; then diff --git a/grub.patches b/grub.patches index 1762e77..7f703a8 100644 --- a/grub.patches +++ b/grub.patches @@ -282,3 +282,4 @@ Patch0281: 0281-efi-use-enumerated-array-positions-for-our-allocatio.patch Patch0282: 0282-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch Patch0283: 0283-efi-allocate-the-initrd-within-the-bounds-expressed-.patch Patch0284: 0284-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch +Patch0285: 0285-BLS-create-etc-kernel-cmdline-during-mkconfig.patch diff --git a/grub2.spec b/grub2.spec index 738083f..e3e31fb 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 42%{?dist} +Release: 43%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -532,6 +532,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Thu Aug 11 2022 Robbie Harwood - 2.06-43 +- Generate BLS snippets during mkconfig +- Resolves: #1969362 + * Tue Aug 02 2022 Robbie Harwood - 2.06-42 - Rest of kernel allocator fixups - Resolves: #2108456