From 71c681ecae1c66339c537453ea5a1b7f307a7fe8 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 16 Apr 2016 18:35:02 +0100 Subject: [PATCH] dmesg: --notime should not suppress --show-delta The --show-delta is off by default, which means it can be only on when user has requested to see these time stamps. The --notime option should not turn the delta outputing off, because then option order matters and no-one wants that. Example of the old output: $ dmesg --notime --show-delta | sed -n 's/ version.*//p; q' [< 0.000000>] Linux $ dmesg --show-delta --notime | sed -n 's/ version.*//p; q' Linux Addresses: https://bugs.launchpad.net/bugs/1544595 Signed-off-by: Sami Kerola --- sys-utils/dmesg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index 99cf26e37e..cf93331418 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -1363,7 +1363,6 @@ int main(int argc, char *argv[]) break; case 't': ctl.time_fmt = DMESG_TIMEFTM_NONE; - delta = 0; break; case 'u': ctl.fltr_fac = 1; -- 2.47.2