From: Sami Kerola <kerolasa@iki.fi>
Date: Sat, 19 Jan 2013 00:09:09 +0000 (+0000)
Subject: dmesg: parse level when --color is used
X-Git-Tag: v2.23-rc1~311
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb9013177c51522f395da122659ed12c336f9167;p=thirdparty%2Futil-linux.git

dmesg: parse level when --color is used

When user runs with --color it should not need to be combined with
filtering per level or facility, or decoding.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index ddab9b4aca..080fe7d3e9 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -658,7 +658,7 @@ static int get_next_syslog_record(struct dmesg_control *ctl,
 			continue;	/* error or empty line? */
 
 		if (*begin == '<') {
-			if (ctl->fltr_lev || ctl->fltr_fac || ctl->decode)
+			if (ctl->fltr_lev || ctl->fltr_fac || ctl->decode || ctl->color)
 				begin = parse_faclev(begin + 1, &rec->facility,
 						     &rec->level);
 			else