You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.5 KiB
37 lines
1.5 KiB
2 years ago
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
||
|
|
Date: Wed, 17 Aug 2022 10:26:07 -0400
|
||
|
|
Subject: [PATCH] squish: don't dup rhgb quiet, check mtimes
|
||
|
|
|
||
|
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
||
|
|
(cherry picked from commit 275a0487c74e309cfd0a8c670740f6c34e729c45)
|
||
|
|
---
|
||
|
|
util/grub.d/10_linux.in | 14 ++++++++++----
|
||
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||
|
|
index ec529eb814..becf5ba9c6 100644
|
||
|
|
--- a/util/grub.d/10_linux.in
|
||
|
|
+++ b/util/grub.d/10_linux.in
|
||
|
|
@@ -166,10 +166,16 @@ 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
|
||
|
|
+ if [[ ! -f /etc/kernel/cmdline ]] ||
|
||
|
|
+ [[ /etc/kernel/cmdline -ot /etc/default/grub ]]; then
|
||
|
|
+ # anaconda has the correct information to create this during install;
|
||
|
|
+ # afterward, grubby will take care of syncing on updates. If the user
|
||
|
|
+ # has modified /etc/default/grub, try to cope.
|
||
|
|
+ if [[ ! "$cmdline" =~ "rhgb quiet" ]]; then
|
||
|
|
+ # ensure these only show up once
|
||
|
|
+ cmdline="$cmdline rhgb quiet"
|
||
|
|
+ fi
|
||
|
|
+ echo "$cmdline" > /etc/kernel/cmdline
|
||
|
|
fi
|
||
|
|
|
||
|
|
for bls in "${files[@]}"; do
|