[gentoo-commits] proj/genkernel:master commit in: defaults/

[Thomas Deutschmann]

commit:     f80b81da305f1f782043d31751f81264be6f2ecd
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 22:42:13 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  5 22:44:45 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f80b81da

linuxrc: Don't mess with console log level in quiet mode

Fixes: d5f7d79b ("linuxrc: Refactor handling of console log level")
Bug: https://bugs.gentoo.org/788970
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/linuxrc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 932df46..6ede740 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -452,8 +452,11 @@ do
 	esac
 done
 
-# Prevent superfluous printks from being printed to the console
-echo ${GK_CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk
+if ! is_quiet
+then
+	# Prevent superfluous printks from being printed to the console
+	echo ${GK_CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk
+fi
 
 good_msg "${GK_META_VERSION} (${GK_META_BUILD_DATE}). Linux kernel ${KV}"
 
@@ -1370,7 +1373,7 @@ do
 	fi
 done
 
-if [[ "${CONSOLE_LOGLEVEL}" != "${GK_CONSOLE_LOGLEVEL}" ]]
+if ! is_quiet && [[ "${CONSOLE_LOGLEVEL}" != "${GK_CONSOLE_LOGLEVEL}" ]]
 then
 	good_msg "Restoring console log level (${CONSOLE_LOGLEVEL}) ..."
 	echo ${CONSOLE_LOGLEVEL} > /proc/sys/kernel/printk \