diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:32 +0000 |
commit | 8bb05ac73a5b448b339ce0bc8d396c82c459b47f (patch) | |
tree | 1fdda006866bca20d41cb206767ea5241e36852f /sys-utils/dmesg.1 | |
parent | Adding debian version 2.39.3-11. (diff) | |
download | util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.tar.xz util-linux-8bb05ac73a5b448b339ce0bc8d396c82c459b47f.zip |
Merging upstream version 2.40.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | sys-utils/dmesg.1 | 19 | ||||
-rw-r--r-- | sys-utils/dmesg.1.adoc | 11 |
2 files changed, 23 insertions, 7 deletions
diff --git a/sys-utils/dmesg.1 b/sys-utils/dmesg.1 index f70633c..a66cf99 100644 --- a/sys-utils/dmesg.1 +++ b/sys-utils/dmesg.1 @@ -2,12 +2,12 @@ .\" Title: dmesg .\" Author: [see the "AUTHOR(S)" section] .\" Generator: Asciidoctor 2.0.20 -.\" Date: 2023-11-23 +.\" Date: 2024-03-20 .\" Manual: User Commands -.\" Source: util-linux 2.39.3 +.\" Source: util-linux 2.40 .\" Language: English .\" -.TH "DMESG" "1" "2023-11-23" "util\-linux 2.39.3" "User Commands" +.TH "DMESG" "1" "2024-03-20" "util\-linux 2.40" "User Commands" .ie \n(.g .ds Aq \(aq .el .ds Aq ' .ss \n[.ss] 0 @@ -83,7 +83,7 @@ Display the local time and the delta in human\-readable format. Be aware that co .sp \fB\-F\fP, \fB\-\-file\fP \fIfile\fP .RS 4 -Read the syslog messages from the given \fIfile\fP. Note that \fB\-F\fP does not support messages in kmsg format. The old syslog format is supported only. +Read the syslog messages from the given \fIfile\fP. Note that \fB\-F\fP does not support messages in kmsg format. See \fB\-K\fP instead. .RE .sp \fB\-f\fP, \fB\-\-facility\fP \fIlist\fP @@ -105,6 +105,11 @@ Enable human\-readable output. See also \fB\-\-color\fP, \fB\-\-reltime\fP and \ Use JSON output format. The time output format is in "sec.usec" format only, log priority level is not decoded by default (use \fB\-\-decode\fP to split into facility and priority), the other options to control the output format or time format are silently ignored. .RE .sp +\fB\-K\fP, \fB\-\-kmsg\-file\fP \fIfile\fP +.RS 4 +Read the /dev/kmsg messages from the given \fIfile\fP. Different record as expected to be separated by a NULL byte. +.RE +.sp \fB\-k\fP, \fB\-\-kernel\fP .RS 4 Print kernel messages. @@ -195,9 +200,13 @@ Do not print kernel\(cqs timestamps. .sp \fB\-\-time\-format\fP \fIformat\fP .RS 4 -Print timestamps using the given \fIformat\fP, which can be \fBctime\fP, \fBreltime\fP, \fBdelta\fP or \fBiso\fP. The first three formats are aliases of the time\-format\-specific options. The \fBiso\fP format is a \fBdmesg\fP 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 \fBiso\fP timestamp is: YYYY\-MM\-DD<T>HH:MM:SS,<microseconds>\(<-+><timezone offset from UTC>. +Print timestamps using the given \fIformat\fP, which can be \fBctime\fP, \fBreltime\fP, \fBdelta\fP, \fBiso\fP or \fBraw\fP. The first three formats are aliases of the time\-format\-specific options. The \fBraw\fP format uses the default timestamp format showing seconds since boot. The \fBiso\fP format is a \fBdmesg\fP 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 \fBiso\fP timestamp is: YYYY\-MM\-DD<T>HH:MM:SS,<microseconds>\(<-+><timezone offset from UTC>. .sp The \fBiso\fP format has the same issue as \fBctime\fP: the time may be inaccurate when a system is suspended and resumed. +.sp +\fB\-\-time\-format\fP may be used multiple times with different values for \fIformat\fP to output each specified format. +.sp +The \fBdelta\fP always follows \fBctime\fP or \fBraw\fP if specified together. .RE .sp \fB\-u\fP, \fB\-\-userspace\fP 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-DD<T>HH:MM:SS,<microseconds><-+><timezone offset from UTC>. +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-DD<T>HH:MM:SS,<microseconds><-+><timezone offset from UTC>. + 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. |