From 1272be04be0cb803eec87f602edb2e3e6f111aea Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 14 Apr 2024 21:33:34 +0200 Subject: Merging upstream version 2.40. Signed-off-by: Daniel Baumann --- sys-utils/dmesg.1.adoc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'sys-utils/dmesg.1.adoc') diff --git a/sys-utils/dmesg.1.adoc b/sys-utils/dmesg.1.adoc index 6f4941e..ccdeefa 100644 --- a/sys-utils/dmesg.1.adoc +++ b/sys-utils/dmesg.1.adoc @@ -57,7 +57,7 @@ Enable printing messages to the console. Display the local time and the delta in human-readable format. Be aware that conversion to the local time could be inaccurate (see *-T* for more details). *-F*, *--file* _file_:: -Read the syslog messages from the given _file_. Note that *-F* does not support messages in kmsg format. The old syslog format is supported only. +Read the syslog messages from the given _file_. Note that *-F* does not support messages in kmsg format. See *-K* instead. *-f*, *--facility* _list_:: Restrict output to the given (comma-separated) _list_ of facilities. For example: @@ -72,6 +72,9 @@ Enable human-readable output. See also *--color*, *--reltime* and *--nopager*. *-J*, *--json*:: Use JSON output format. The time output format is in "sec.usec" format only, log priority level is not decoded by default (use *--decode* to split into facility and priority), the other options to control the output format or time format are silently ignored. +*-K*, *--kmsg-file* _file_:: +Read the /dev/kmsg messages from the given _file_. Different record as expected to be separated by a NULL byte. + *-k*, *--kernel*:: Print kernel messages. @@ -133,9 +136,13 @@ Display record until the specified time. Supported is the subsecond granularity. Do not print kernel's timestamps. *--time-format* _format_:: -Print timestamps using the given _format_, which can be *ctime*, *reltime*, *delta* or *iso*. The first three formats are aliases of the time-format-specific options. The *iso* format is a *dmesg* implementation of the ISO-8601 timestamp format. The purpose of this format is to make the comparing of timestamps between two systems, and any other parsing, easy. The definition of the *iso* timestamp is: YYYY-MM-DDHH:MM:SS,<-+>. +Print timestamps using the given _format_, which can be *ctime*, *reltime*, *delta*, *iso* or *raw*. The first three formats are aliases of the time-format-specific options. The *raw* format uses the default timestamp format showing seconds since boot. The *iso* format is a *dmesg* implementation of the ISO-8601 timestamp format. The purpose of this format is to make the comparing of timestamps between two systems, and any other parsing, easy. The definition of the *iso* timestamp is: YYYY-MM-DDHH:MM:SS,<-+>. + The *iso* format has the same issue as *ctime*: the time may be inaccurate when a system is suspended and resumed. ++ +*--time-format* may be used multiple times with different values for _format_ to output each specified format. ++ +The *delta* always follows *ctime* or *raw* if specified together. *-u*, *--userspace*:: Print userspace messages. -- cgit v1.2.3