From: Karel Zak <kzak@redhat.com>
Date: Wed, 20 Apr 2022 12:42:32 +0000 (+0200)
Subject: dmesg: fix --since and --until
X-Git-Tag: v2.39-rc1~701
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9667633f1f6b7a84116f2af067d1d15c72e6382;p=thirdparty%2Futil-linux.git

dmesg: fix --since and --until

Now --since and --until requires any time field in the output (e.g.
--ctime,-T), it means "dmesg --since '1 day ago'" doesn't work, but
"dmesg -T --since '1 day ago'" works as expected.

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2076829
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 7cca88f2bb..017936255f 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1592,7 +1592,9 @@ int main(int argc, char *argv[])
 
 	if ((is_timefmt(&ctl, RELTIME) ||
 	     is_timefmt(&ctl, CTIME)   ||
-	     is_timefmt(&ctl, ISO8601))) {
+	     is_timefmt(&ctl, ISO8601)) ||
+	     ctl.since ||
+	     ctl.until) {
 		if (dmesg_get_boot_time(&ctl.boot_time) != 0)
 			ctl.time_fmt = DMESG_TIMEFTM_NONE;
 		else