Some unused log levels have been removed, and kdump has used the
different options to control the log levels for the first kernel
and the second kernel. Therefore, let's update the kdump sysconfig
accordingly.
Signed-off-by: Lianbo Jiang <lijiang(a)redhat.com>
---
kdump.sysconfig | 26 +++++++++++++-------------
kdump.sysconfig.aarch64 | 26 +++++++++++++-------------
kdump.sysconfig.i386 | 26 +++++++++++++-------------
kdump.sysconfig.ppc64 | 26 +++++++++++++-------------
kdump.sysconfig.ppc64le | 26 +++++++++++++-------------
kdump.sysconfig.s390x | 26 +++++++++++++-------------
kdump.sysconfig.x86_64 | 26 +++++++++++++-------------
7 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/kdump.sysconfig b/kdump.sysconfig
index 52a0b9249fe7..30f0c63801f5 100644
--- a/kdump.sysconfig
+++ b/kdump.sysconfig
@@ -36,18 +36,18 @@ KEXEC_ARGS=""
#What is the image type used for kdump
KDUMP_IMG="vmlinuz"
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
diff --git a/kdump.sysconfig.aarch64 b/kdump.sysconfig.aarch64
index 1d75979df03e..6f7830a8c3e8 100644
--- a/kdump.sysconfig.aarch64
+++ b/kdump.sysconfig.aarch64
@@ -36,18 +36,18 @@ KEXEC_ARGS=""
#What is the image type used for kdump
KDUMP_IMG="vmlinuz"
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
diff --git a/kdump.sysconfig.i386 b/kdump.sysconfig.i386
index 2eb9705e32e9..d2de7d61dd94 100644
--- a/kdump.sysconfig.i386
+++ b/kdump.sysconfig.i386
@@ -39,18 +39,18 @@ KDUMP_IMG="vmlinuz"
#What is the images extension. Relocatable kernels don't have one
KDUMP_IMG_EXT=""
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
diff --git a/kdump.sysconfig.ppc64 b/kdump.sysconfig.ppc64
index 24279ff34211..39b69bb8d72b 100644
--- a/kdump.sysconfig.ppc64
+++ b/kdump.sysconfig.ppc64
@@ -41,18 +41,18 @@ KDUMP_IMG_EXT=""
#Specify the action after failure
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
diff --git a/kdump.sysconfig.ppc64le b/kdump.sysconfig.ppc64le
index 24279ff34211..39b69bb8d72b 100644
--- a/kdump.sysconfig.ppc64le
+++ b/kdump.sysconfig.ppc64le
@@ -41,18 +41,18 @@ KDUMP_IMG_EXT=""
#Specify the action after failure
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
diff --git a/kdump.sysconfig.s390x b/kdump.sysconfig.s390x
index 5e1cb5a7ad89..f9218e5d1365 100644
--- a/kdump.sysconfig.s390x
+++ b/kdump.sysconfig.s390x
@@ -42,18 +42,18 @@ KDUMP_IMG="vmlinuz"
#What is the images extension. Relocatable kernels don't have one
KDUMP_IMG_EXT=""
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
diff --git a/kdump.sysconfig.x86_64 b/kdump.sysconfig.x86_64
index eb1c53824241..052189327f74 100644
--- a/kdump.sysconfig.x86_64
+++ b/kdump.sysconfig.x86_64
@@ -39,18 +39,18 @@ KDUMP_IMG="vmlinuz"
#What is the images extension. Relocatable kernels don't have one
KDUMP_IMG_EXT=""
-# Logging is controlled by following global variables:
-# - @var kdump_stdloglvl - logging level to standard error (console output)
-# - @var kdump_sysloglvl - logging level to syslog (by logger command)
-# - @var kdump_kmsgloglvl - logging level to /dev/kmsg (only for boot-time)
-# If any of the variables is not set, this function set it to default:
-# - @var kdump_stdloglvl=4 (info)
-# - @var kdump_sysloglvl=4 (info)
-# - @var kdump_kmsgloglvl=0 (no logging)
+# Logging is controlled by following variables in the first kernel:
+# - @var KDUMP_STDLOGLVL - logging level to standard error (console output)
+# - @var KDUMP_SYSLOGLVL - logging level to syslog (by logger command)
+# - @var KDUMP_KMSGLOGLVL - logging level to /dev/kmsg (only for boot-time)
#
-# Logging levels: fatal(1),error(2),warn(3),info(4),debug(5),trace(6)
+# In the second kernel, kdump will use the rd.kdumploglvl option to set the
+# log level in the above KDUMP_COMMANDLINE_APPEND.
+# - @var rd.kdumploglvl - logging level to syslog (by logger command)
+# - for example: add the rd.kdumploglvl=3 option to KDUMP_COMMANDLINE_APPEND
#
-# For example: the following configurations indicate that kdump messages will be printed
-# to console and journald for debugging case.
-# kdump_sysloglvl=5
-# kdump_stdloglvl=5
+# Logging levels: no logging(0), error(1),warn(2),info(3),debug(4)
+#
+# KDUMP_STDLOGLVL=3
+# KDUMP_SYSLOGLVL=0
+# KDUMP_KMSGLOGLVL=0
--
2.17.1