diff options
| author | Ondrej Oprala | 2014-01-23 13:03:45 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-11 09:38:09 +0100 |
| commit | d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c (patch) | |
| tree | e3022408c0a770a666be7ff829e3f9291883cf59 /sys-utils/dmesg.c | |
| parent | tests: check commands needed for running a test exist (diff) | |
| download | kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.tar.gz kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.tar.xz kernel-qcow2-util-linux-d0c9ddc3cc18f0f374a0d13516dacbda2e3a1a0c.zip | |
lib/colors: check for /etc/terminal-colors.d/[util].disable
[kzak@redhat.com: - move paths to pathnames.h,
- use static path buffer]
Signed-off-by: Ondrej Oprala <ooprala@redhat.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/dmesg.c')
| -rw-r--r-- | sys-utils/dmesg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index 3ed0b1db7..c1f84a568 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -1187,7 +1187,7 @@ int main(int argc, char *argv[]) .kmsg = -1, .time_fmt = DMESG_TIMEFTM_TIME, }; - int colormode = UL_COLORMODE_NEVER; + int colormode = UL_COLORMODE_UNDEF; enum { OPT_TIME_FORMAT = CHAR_MAX + 1, }; @@ -1377,7 +1377,7 @@ int main(int argc, char *argv[]) } - ctl.color = colors_init(colormode) ? 1 : 0; + ctl.color = colors_init(colormode, "dmesg") ? 1 : 0; if (ctl.follow) nopager = 1; ctl.pager = nopager ? 0 : ctl.pager; |