summaryrefslogtreecommitdiffstats
path: root/sys-utils/dmesg.c
diff options
context:
space:
mode:
authorSami Kerola2013-07-07 21:54:25 +0200
committerKarel Zak2013-07-09 14:24:53 +0200
commite7ba987a04b78189177987c42eb6ffed439b1c4b (patch)
treebd0c3b030d01ba9c97f4b22d788a1d44976d61ac /sys-utils/dmesg.c
parentdocs: add missing options to sfdisk manual (diff)
downloadkernel-qcow2-util-linux-e7ba987a04b78189177987c42eb6ffed439b1c4b.tar.gz
kernel-qcow2-util-linux-e7ba987a04b78189177987c42eb6ffed439b1c4b.tar.xz
kernel-qcow2-util-linux-e7ba987a04b78189177987c42eb6ffed439b1c4b.zip
dmesg: inform user --show-delta and iso8601 time format does not mix
References: http://marc.info/?l=util-linux-ng&m=137267606929951&w=2 Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'sys-utils/dmesg.c')
-rw-r--r--sys-utils/dmesg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index e6819308c..88713d55d 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1364,6 +1364,9 @@ int main(int argc, char *argv[])
case DMESG_TIMEFTM_TIME:
ctl.time_fmt = DMESG_TIMEFTM_TIME_DELTA;
break;
+ case DMESG_TIMEFTM_ISO8601:
+ warnx(_("--show-delta is ignored when used together with iso8601 time format"));
+ break;
default:
ctl.time_fmt = DMESG_TIMEFTM_DELTA;
}