summaryrefslogtreecommitdiff
path: root/src/systemctl/systemctl.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-10-18 23:34:37 +0200
committerLennart Poettering <lennart@poettering.net>2012-10-18 23:35:44 +0200
commitf89a3b6f5bf695186e7b9e6cc63993b1272e7569 (patch)
tree8478df8b23a18b3a8f2968522df0928cede5ec92 /src/systemctl/systemctl.c
parentcd4b13e0bfe9281a0d2c0c3bef1c589d0684950b (diff)
journalctl: unify ellipsation handling between journalctl and systemctl
Diffstat (limited to 'src/systemctl/systemctl.c')
-rw-r--r--src/systemctl/systemctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 7d6a6a24f3..82c801e4d9 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2293,9 +2293,10 @@ static void print_status_info(UnitStatusInfo *i) {
if (i->id && arg_transport != TRANSPORT_SSH) {
int flags =
arg_all * OUTPUT_SHOW_ALL |
+ (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH |
+ on_tty() * OUTPUT_COLOR |
arg_follow * OUTPUT_FOLLOW |
- !arg_quiet * OUTPUT_WARN_CUTOFF |
- on_tty() * OUTPUT_COLOR;
+ !arg_quiet * OUTPUT_WARN_CUTOFF;
printf("\n");
show_journal_by_unit(stdout,