chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
readahead: bring export definition of sd-readahead in line with sd-daemon
[elogind.git]
/
src
/
systemctl.c
diff --git
a/src/systemctl.c
b/src/systemctl.c
index b940c9c64e7eac9a4bcfed74b2e1581fc012ea1f..1142200e426b73884a967936e72bbd785c75e683 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-377,8
+377,7
@@
static void output_units_list(const struct unit_info *unit_infos, unsigned c) {
n_shown++;
n_shown++;
- if (!streq(u->load_state, "loaded") &&
- !streq(u->load_state, "banned")) {
+ if (streq(u->load_state, "error")) {
on_loaded = ansi_highlight(true);
off_loaded = ansi_highlight(false);
} else
on_loaded = ansi_highlight(true);
off_loaded = ansi_highlight(false);
} else
@@
-2063,8
+2062,7
@@
static void print_status_info(UnitStatusInfo *i) {
if (i->following)
printf("\t Follow: unit currently follows state of %s\n", i->following);
if (i->following)
printf("\t Follow: unit currently follows state of %s\n", i->following);
- if (streq_ptr(i->load_state, "failed") ||
- streq_ptr(i->load_state, "banned")) {
+ if (streq_ptr(i->load_state, "error")) {
on = ansi_highlight(true);
off = ansi_highlight(false);
} else
on = ansi_highlight(true);
off = ansi_highlight(false);
} else
@@
-2201,7
+2199,7
@@
static void print_status_info(UnitStatusInfo *i) {
if (i->running) {
char *t = NULL;
if (i->running) {
char *t = NULL;
- get_process_
name
(i->main_pid, &t);
+ get_process_
comm
(i->main_pid, &t);
if (t) {
printf(" (%s)", t);
free(t);
if (t) {
printf(" (%s)", t);
free(t);
@@
-2235,7
+2233,7
@@
static void print_status_info(UnitStatusInfo *i) {
printf(" Control: %u", (unsigned) i->control_pid);
printf(" Control: %u", (unsigned) i->control_pid);
- get_process_
name
(i->control_pid, &t);
+ get_process_
comm
(i->control_pid, &t);
if (t) {
printf(" (%s)", t);
free(t);
if (t) {
printf(" (%s)", t);
free(t);
@@
-5000,7
+4998,7
@@
static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
* enable/disable */
if (!streq(verbs[i].verb, "enable") &&
!streq(verbs[i].verb, "disable") &&
* enable/disable */
if (!streq(verbs[i].verb, "enable") &&
!streq(verbs[i].verb, "disable") &&
- !streq(verbs[i].verb, "is-enable") &&
+ !streq(verbs[i].verb, "is-enable
d
") &&
!streq(verbs[i].verb, "list-unit-files") &&
!streq(verbs[i].verb, "reenable") &&
!streq(verbs[i].verb, "preset") &&
!streq(verbs[i].verb, "list-unit-files") &&
!streq(verbs[i].verb, "reenable") &&
!streq(verbs[i].verb, "preset") &&