|
Michal Schmidt |
e43452 |
From 3fc55e7a9f4dc14ca74ed6b293e1fac03e1fec74 Mon Sep 17 00:00:00 2001
|
|
Michal Schmidt |
e43452 |
From: Michal Schmidt <mschmidt@redhat.com>
|
|
Michal Schmidt |
e43452 |
Date: Tue, 6 Dec 2011 01:14:36 +0100
|
|
Michal Schmidt |
f1996e |
Subject: [PATCH] systemctl: print 'error' load state in red
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
Be consistent in coloring of load states in list-units and status.
|
|
Michal Schmidt |
e43452 |
Print only 'error' in red.
|
|
Michal Schmidt |
e43452 |
There are no 'banned' or 'failed' states. Do not color 'masked', it's
|
|
Michal Schmidt |
e43452 |
not an error.
|
|
Michal Schmidt |
e43452 |
(cherry picked from commit f7b9e331ed71fb2f832ac5587fb5119dd2bfc32f)
|
|
Michal Schmidt |
e43452 |
---
|
|
Michal Schmidt |
e43452 |
src/systemctl.c | 6 ++----
|
|
Michal Schmidt |
e43452 |
1 files changed, 2 insertions(+), 4 deletions(-)
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
diff --git a/src/systemctl.c b/src/systemctl.c
|
|
Michal Schmidt |
e43452 |
index 668641d..960d3c0 100644
|
|
Michal Schmidt |
e43452 |
--- a/src/systemctl.c
|
|
Michal Schmidt |
e43452 |
+++ b/src/systemctl.c
|
|
Michal Schmidt |
e43452 |
@@ -377,8 +377,7 @@ static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
n_shown++;
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
- if (!streq(u->load_state, "loaded") &&
|
|
Michal Schmidt |
e43452 |
- !streq(u->load_state, "banned")) {
|
|
Michal Schmidt |
e43452 |
+ if (streq(u->load_state, "error")) {
|
|
Michal Schmidt |
e43452 |
on_loaded = ansi_highlight(true);
|
|
Michal Schmidt |
e43452 |
off_loaded = ansi_highlight(false);
|
|
Michal Schmidt |
e43452 |
} else
|
|
Michal Schmidt |
e43452 |
@@ -2063,8 +2062,7 @@ static void print_status_info(UnitStatusInfo *i) {
|
|
Michal Schmidt |
e43452 |
if (i->following)
|
|
Michal Schmidt |
e43452 |
printf("\t Follow: unit currently follows state of %s\n", i->following);
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
- if (streq_ptr(i->load_state, "failed") ||
|
|
Michal Schmidt |
e43452 |
- streq_ptr(i->load_state, "banned")) {
|
|
Michal Schmidt |
e43452 |
+ if (streq_ptr(i->load_state, "error")) {
|
|
Michal Schmidt |
e43452 |
on = ansi_highlight(true);
|
|
Michal Schmidt |
e43452 |
off = ansi_highlight(false);
|
|
Michal Schmidt |
e43452 |
} else
|
|
Michal Schmidt |
e43452 |
--
|
|
Michal Schmidt |
e43452 |
1.7.7.5
|
|
Michal Schmidt |
e43452 |
|