Populate /etc/kernel/cmdline during mkconfig

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-08-02 19:57:27 +00:00
parent 74d57bbd19
commit 11e6d3f1b0
3 changed files with 33 additions and 2 deletions

View file

@ -0,0 +1,27 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 2 Aug 2022 15:56:28 -0400
Subject: [PATCH] BLS: create /etc/kernel/cmdline during mkconfig
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
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 6af84b44e1..950a92f5e8 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -161,6 +161,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

View file

@ -273,3 +273,4 @@ Patch0272: 0272-efi-use-enumerated-array-positions-for-our-allocatio.patch
Patch0273: 0273-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
Patch0274: 0274-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
Patch0275: 0275-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
Patch0276: 0276-BLS-create-etc-kernel-cmdline-during-mkconfig.patch

View file

@ -17,7 +17,7 @@
Name: grub2
Epoch: 1
Version: 2.06
Release: 45%{?dist}
Release: 46%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+
URL: http://www.gnu.org/software/grub/
@ -530,7 +530,10 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif
%changelog
* Mon Aug 02 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-45
* Tue Aug 02 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-46
- Populate /etc/kernel/cmdline during mkconfig
* Tue Aug 02 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-45
- Rest of allocator fixes
* Mon Aug 01 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-44