diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-01-20 13:44:31 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-01-20 13:44:31 +0100 |
| commit | a9cb7caba6a58ac72d9d8754fee546b881d6ce57 (patch) | |
| tree | df2f482acf54cb7d13e557b37f7a1bc4984c1c76 /src/machine/machinectl.c | |
| parent | f7e29f72bf5a440737bdf8a1fc81053b5f44cb64 (diff) | |
| parent | 40c9fe4c0862114dab390c8ed16f78cf056b9140 (diff) | |
Merge pull request #2381 from jsynacek/journalctl-colors-v4
basic/terminal-util: introduce SYSTEMD_COLORS environment variable
Diffstat (limited to 'src/machine/machinectl.c')
| -rw-r--r-- | src/machine/machinectl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 38a75f85d5..fd454310ae 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -108,7 +108,7 @@ static OutputFlags get_output_flags(void) { arg_all * OUTPUT_SHOW_ALL | arg_full * OUTPUT_FULL_WIDTH | (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | - on_tty() * OUTPUT_COLOR | + colors_enabled() * OUTPUT_COLOR | !arg_quiet * OUTPUT_WARN_CUTOFF; } |