chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hostnamed: add a new chassis type for watches
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 03720f411d7b41fc4cdebc09b5ed8bb8308c1e25..96a0d0578ee2459f153dcd9c99a518d409b00e54 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-456,7
+456,7
@@
static int output_units_list(const UnitInfo *unit_infos, unsigned c) {
}
if (circle_len > 0)
}
if (circle_len > 0)
- printf("%s%s%s
", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "
", off_circle);
+ printf("%s%s%s
", on_circle, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "
", off_circle);
printf("%s%-*s%s %s%-*s%s %s%-*s %-*s%s %-*s",
on_active, id_len, id, off_active,
printf("%s%-*s%s %s%-*s%s %s%-*s %-*s%s %-*s",
on_active, id_len, id, off_active,
@@
-3170,6
+3170,7
@@
typedef struct UnitStatusInfo {
const char *status_text;
const char *pid_file;
bool running:1;
const char *status_text;
const char *pid_file;
bool running:1;
+ int status_errno;
usec_t start_timestamp;
usec_t exit_timestamp;
usec_t start_timestamp;
usec_t exit_timestamp;
@@
-3441,6
+3442,8
@@
static void print_status_info(
if (i->status_text)
printf(" Status: \"%s\"\n", i->status_text);
if (i->status_text)
printf(" Status: \"%s\"\n", i->status_text);
+ if (i->status_errno > 0)
+ printf(" Error: %i (%s)\n", i->status_errno, strerror(i->status_errno));
if (i->control_group &&
(i->main_pid > 0 || i->control_pid > 0 ||
if (i->control_group &&
(i->main_pid > 0 || i->control_pid > 0 ||
@@
-3661,6
+3664,8
@@
static int status_property(const char *name, sd_bus_message *m, UnitStatusInfo *
i->exit_code = (int) j;
else if (streq(name, "ExecMainStatus"))
i->exit_status = (int) j;
i->exit_code = (int) j;
else if (streq(name, "ExecMainStatus"))
i->exit_status = (int) j;
+ else if (streq(name, "StatusErrno"))
+ i->status_errno = (int) j;
break;
}
break;
}