aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-06-24 00:42:13 +0200
committerThomas Deutschmann <whissi@gentoo.org>2021-07-06 00:44:45 +0200
commitf80b81da305f1f782043d31751f81264be6f2ecd (patch)
tree3473cb6b0eae8e29f7adb10a84c4a78258dbc085
parentdefaults/modules_load: Add support for Lenovo / Thinkpad devices (diff)
downloadgenkernel-f80b81da.tar.gz
genkernel-f80b81da.tar.bz2
genkernel-f80b81da.zip
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@gentoo.org>
-rw-r--r--defaults/linuxrc9
1 files 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 \