chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: return an error code is status fails
[elogind.git]
/
src
/
systemctl
/
systemctl.c
diff --git
a/src/systemctl/systemctl.c
b/src/systemctl/systemctl.c
index 0887bc397727f35cac2eccf4b61d947c89b32e3f..e1e4640ae8f47ef6d3419360eb73ba5f157dae92 100644
(file)
--- a/
src/systemctl/systemctl.c
+++ b/
src/systemctl/systemctl.c
@@
-515,7
+515,7
@@
static int get_unit_list(
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
- size_t size;
+ size_t size
= c
;
int r;
UnitInfo u;
int r;
UnitInfo u;
@@
-523,8
+523,6
@@
static int get_unit_list(
assert(unit_infos);
assert(_reply);
assert(unit_infos);
assert(_reply);
- size = sizeof(UnitInfo) * c;
-
r = sd_bus_call_method(
bus,
"org.freedesktop.systemd1",
r = sd_bus_call_method(
bus,
"org.freedesktop.systemd1",
@@
-742,6
+740,7
@@
static int get_listening(
}
struct socket_info {
}
struct socket_info {
+ const char *machine;
const char* id;
char* type;
const char* id;
char* type;
@@
-762,6
+761,16
@@
static int socket_info_compare(const struct socket_info *a, const struct socket_
assert(a);
assert(b);
assert(a);
assert(b);
+ if (!a->machine && b->machine)
+ return -1;
+ if (a->machine && !b->machine)
+ return 1;
+ if (a->machine && b->machine) {
+ o = strcasecmp(a->machine, b->machine);
+ if (o != 0)
+ return o;
+ }
+
o = strcmp(a->path, b->path);
if (o == 0)
o = strcmp(a->type, b->type);
o = strcmp(a->path, b->path);
if (o == 0)
o = strcmp(a->type, b->type);
@@
-784,7
+793,7
@@
static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) {
socklen = MAX(socklen, strlen(s->id));
if (arg_show_types)
typelen = MAX(typelen, strlen(s->type));
socklen = MAX(socklen, strlen(s->id));
if (arg_show_types)
typelen = MAX(typelen, strlen(s->type));
- pathlen = MAX(pathlen, strlen(s->path));
+ pathlen = MAX(pathlen, strlen(s->path)
+ (s->machine ? strlen(s->machine)+1 : 0)
);
STRV_FOREACH(a, s->triggered)
tmp += strlen(*a) + 2*(a != s->triggered);
STRV_FOREACH(a, s->triggered)
tmp += strlen(*a) + 2*(a != s->triggered);
@@
-800,14
+809,24
@@
static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) {
"ACTIVATES");
for (s = socket_infos; s < socket_infos + cs; s++) {
"ACTIVATES");
for (s = socket_infos; s < socket_infos + cs; s++) {
+ _cleanup_free_ char *j = NULL;
+ const char *path;
char **a;
char **a;
+ if (s->machine) {
+ j = strjoin(s->machine, ":", s->path, NULL);
+ if (!j)
+ return log_oom();
+ path = j;
+ } else
+ path = s->path;
+
if (arg_show_types)
printf("%-*s %-*s %-*s",
if (arg_show_types)
printf("%-*s %-*s %-*s",
- pathlen,
s->
path, typelen, s->type, socklen, s->id);
+ pathlen, path, typelen, s->type, socklen, s->id);
else
printf("%-*s %-*s",
else
printf("%-*s %-*s",
- pathlen,
s->
path, socklen, s->id);
+ pathlen, path, socklen, s->id);
STRV_FOREACH(a, s->triggered)
printf("%s %s",
a == s->triggered ? "" : ",", *a);
STRV_FOREACH(a, s->triggered)
printf("%s %s",
a == s->triggered ? "" : ",", *a);
@@
-833,7
+852,8
@@
static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) {
}
static int list_sockets(sd_bus *bus, char **args) {
}
static int list_sockets(sd_bus *bus, char **args) {
- _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+ _cleanup_(message_set_freep) Set *replies = NULL;
+ _cleanup_strv_free_ char **machines = NULL;
_cleanup_free_ UnitInfo *unit_infos = NULL;
_cleanup_free_ struct socket_info *socket_infos = NULL;
const UnitInfo *u;
_cleanup_free_ UnitInfo *unit_infos = NULL;
_cleanup_free_ struct socket_info *socket_infos = NULL;
const UnitInfo *u;
@@
-844,7
+864,7
@@
static int list_sockets(sd_bus *bus, char **args) {
pager_open_if_enabled();
pager_open_if_enabled();
- n = get_unit_list
(bus, NULL, strv_skip_first(args), &unit_infos, 0, &reply
);
+ n = get_unit_list
_recursive(bus, strv_skip_first(args), &unit_infos, &replies, &machines
);
if (n < 0)
return n;
if (n < 0)
return n;
@@
-872,6
+892,7
@@
static int list_sockets(sd_bus *bus, char **args) {
for (i = 0; i < c; i++)
socket_infos[cs + i] = (struct socket_info) {
for (i = 0; i < c; i++)
socket_infos[cs + i] = (struct socket_info) {
+ .machine = u->machine,
.id = u->id,
.type = listening[i*2],
.path = listening[i*2 + 1],
.id = u->id,
.type = listening[i*2],
.path = listening[i*2 + 1],
@@
-977,6
+998,7
@@
static int get_last_trigger(
}
struct timer_info {
}
struct timer_info {
+ const char* machine;
const char* id;
usec_t next_elapse;
usec_t last_trigger;
const char* id;
usec_t next_elapse;
usec_t last_trigger;
@@
-984,9
+1006,21
@@
struct timer_info {
};
static int timer_info_compare(const struct timer_info *a, const struct timer_info *b) {
};
static int timer_info_compare(const struct timer_info *a, const struct timer_info *b) {
+ int o;
+
assert(a);
assert(b);
assert(a);
assert(b);
+ if (!a->machine && b->machine)
+ return -1;
+ if (a->machine && !b->machine)
+ return 1;
+ if (a->machine && b->machine) {
+ o = strcasecmp(a->machine, b->machine);
+ if (o != 0)
+ return o;
+ }
+
if (a->next_elapse < b->next_elapse)
return -1;
if (a->next_elapse > b->next_elapse)
if (a->next_elapse < b->next_elapse)
return -1;
if (a->next_elapse > b->next_elapse)
@@
-1033,7
+1067,7
@@
static int output_timers_list(struct timer_info *timer_infos, unsigned n) {
passedlen = MAX(passedlen, strlen(trel));
}
passedlen = MAX(passedlen, strlen(trel));
}
- unitlen = MAX(unitlen, strlen(t->id));
+ unitlen = MAX(unitlen, strlen(t->id)
+ (t->machine ? strlen(t->machine)+1 : 0)
);
STRV_FOREACH(a, t->triggered)
ul += strlen(*a) + 2*(a != t->triggered);
STRV_FOREACH(a, t->triggered)
ul += strlen(*a) + 2*(a != t->triggered);
@@
-1052,6
+1086,8
@@
static int output_timers_list(struct timer_info *timer_infos, unsigned n) {
"ACTIVATES");
for (t = timer_infos; t < timer_infos + n; t++) {
"ACTIVATES");
for (t = timer_infos; t < timer_infos + n; t++) {
+ _cleanup_free_ char *j = NULL;
+ const char *unit;
char tstamp1[FORMAT_TIMESTAMP_MAX] = "n/a", trel1[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
char tstamp2[FORMAT_TIMESTAMP_MAX] = "n/a", trel2[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
char **a;
char tstamp1[FORMAT_TIMESTAMP_MAX] = "n/a", trel1[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
char tstamp2[FORMAT_TIMESTAMP_MAX] = "n/a", trel2[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a";
char **a;
@@
-1062,8
+1098,16
@@
static int output_timers_list(struct timer_info *timer_infos, unsigned n) {
format_timestamp(tstamp2, sizeof(tstamp2), t->last_trigger);
format_timestamp_relative(trel2, sizeof(trel2), t->last_trigger);
format_timestamp(tstamp2, sizeof(tstamp2), t->last_trigger);
format_timestamp_relative(trel2, sizeof(trel2), t->last_trigger);
+ if (t->machine) {
+ j = strjoin(t->machine, ":", t->id, NULL);
+ if (!j)
+ return log_oom();
+ unit = j;
+ } else
+ unit = t->id;
+
printf("%-*s %-*s %-*s %-*s %-*s",
printf("%-*s %-*s %-*s %-*s %-*s",
- nextlen, tstamp1, leftlen, trel1, lastlen, tstamp2, passedlen, trel2, unitlen,
t->id
);
+ nextlen, tstamp1, leftlen, trel1, lastlen, tstamp2, passedlen, trel2, unitlen,
unit
);
STRV_FOREACH(a, t->triggered)
printf("%s %s",
STRV_FOREACH(a, t->triggered)
printf("%s %s",
@@
-1115,8
+1159,8
@@
static usec_t calc_next_elapse(dual_timestamp *nw, dual_timestamp *next) {
}
static int list_timers(sd_bus *bus, char **args) {
}
static int list_timers(sd_bus *bus, char **args) {
-
- _cleanup_
bus_message_unref_ sd_bus_message *reply
= NULL;
+ _cleanup_(message_set_freep) Set *replies = NULL;
+ _cleanup_
strv_free_ char **machines
= NULL;
_cleanup_free_ struct timer_info *timer_infos = NULL;
_cleanup_free_ UnitInfo *unit_infos = NULL;
struct timer_info *t;
_cleanup_free_ struct timer_info *timer_infos = NULL;
_cleanup_free_ UnitInfo *unit_infos = NULL;
struct timer_info *t;
@@
-1128,7
+1172,7
@@
static int list_timers(sd_bus *bus, char **args) {
pager_open_if_enabled();
pager_open_if_enabled();
- n = get_unit_list
(bus, NULL, strv_skip_first(args), &unit_infos, 0, &reply
);
+ n = get_unit_list
_recursive(bus, strv_skip_first(args), &unit_infos, &replies, &machines
);
if (n < 0)
return n;
if (n < 0)
return n;
@@
-1160,6
+1204,7
@@
static int list_timers(sd_bus *bus, char **args) {
m = calc_next_elapse(&nw, &next);
timer_infos[c++] = (struct timer_info) {
m = calc_next_elapse(&nw, &next);
timer_infos[c++] = (struct timer_info) {
+ .machine = u->machine,
.id = u->id,
.next_elapse = m,
.last_trigger = last,
.id = u->id,
.next_elapse = m,
.last_trigger = last,
@@
-1385,7
+1430,7
@@
static int list_dependencies_print(const char *name, int level, unsigned int bra
printf("%s...\n",max_len % 2 ? "" : " ");
return 0;
}
printf("%s...\n",max_len % 2 ? "" : " ");
return 0;
}
- printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERT : DRAW_TREE_SPACE));
+ printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERT
ICAL
: DRAW_TREE_SPACE));
}
len += 2;
}
len += 2;
@@
-1553,9
+1598,9
@@
static int list_dependencies_one(
state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true);
if (state > 0)
state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true);
if (state > 0)
- printf("%s%s%s", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+ printf("%s%s%s
", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
else
else
- printf("%s%s%s", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
+ printf("%s%s%s
", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off());
r = list_dependencies_print(*c, level, branches, c[1] == NULL);
if (r < 0)
r = list_dependencies_print(*c, level, branches, c[1] == NULL);
if (r < 0)
@@
-1788,7
+1833,7
@@
static void output_machines_list(struct machine_info *machine_infos, unsigned n)
on_failed = off_failed = "";
if (circle_len > 0)
on_failed = off_failed = "";
if (circle_len > 0)
- printf("%s%s%s
", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "
", off_state);
+ printf("%s%s%s
", on_state, circle ? draw_special_char(DRAW_BLACK_CIRCLE) : "
", off_state);
if (m->is_host)
printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n",
if (m->is_host)
printf("%-*s (host) %s%-*s%s %s%*u%s %*u\n",
@@
-1923,7
+1968,7
@@
static int set_default(sd_bus *bus, char **args) {
return log_oom();
if (!bus || avoid_bus()) {
return log_oom();
if (!bus || avoid_bus()) {
- r = unit_file_set_default(arg_scope, arg_root, unit,
arg_forc
e, &changes, &n_changes);
+ r = unit_file_set_default(arg_scope, arg_root, unit,
tru
e, &changes, &n_changes);
if (r < 0) {
log_error("Failed to set default target: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to set default target: %s", strerror(-r));
return r;
@@
-1945,7
+1990,7
@@
static int set_default(sd_bus *bus, char **args) {
"SetDefaultTarget",
&error,
&reply,
"SetDefaultTarget",
&error,
&reply,
- "sb", unit,
arg_forc
e);
+ "sb", unit,
tru
e);
if (r < 0) {
log_error("Failed to set default target: %s", bus_error_message(&error, -r));
return r;
if (r < 0) {
log_error("Failed to set default target: %s", bus_error_message(&error, -r));
return r;
@@
-1955,7
+2000,7
@@
static int set_default(sd_bus *bus, char **args) {
if (r < 0)
return r;
if (r < 0)
return r;
- /* Try to reload if enab
el
d */
+ /* Try to reload if enab
le
d */
if (!arg_no_reload)
r = daemon_reload(bus, args);
else
if (!arg_no_reload)
r = daemon_reload(bus, args);
else
@@
-3189,7
+3234,7
@@
static void print_status_info(
} else
active_on = active_off = "";
} else
active_on = active_off = "";
- printf("%s%s%s%s", active_on, draw_special_char(DRAW_BLACK_CIRCLE), active_off, strna(i->id));
+ printf("%s%s%s
%s", active_on, draw_special_char(DRAW_BLACK_CIRCLE), active_off, strna(i->id));
if (i->description && !streq_ptr(i->id, i->description))
printf(" - %s", i->description);
if (i->description && !streq_ptr(i->id, i->description))
printf(" - %s", i->description);
@@
-4240,7
+4285,7
@@
static int show_all(
_cleanup_free_ UnitInfo *unit_infos = NULL;
const UnitInfo *u;
unsigned c;
_cleanup_free_ UnitInfo *unit_infos = NULL;
const UnitInfo *u;
unsigned c;
- int r;
+ int r
, ret = 0
;
r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply);
if (r < 0)
r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply);
if (r < 0)
@@
-4262,9
+4307,11
@@
static int show_all(
r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
if (r < 0)
return r;
r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
if (r < 0)
return r;
+ else if (r > 0 && ret == 0)
+ ret = r;
}
}
- return
0
;
+ return
ret
;
}
static int show_system_status(sd_bus *bus) {
}
static int show_system_status(sd_bus *bus) {
@@
-4293,7
+4340,7
@@
static int show_system_status(sd_bus *bus) {
} else
on = off = "";
} else
on = off = "";
- printf("%s%s%s%s\n", on, draw_special_char(DRAW_BLACK_CIRCLE), off, arg_host ? arg_host : hn);
+ printf("%s%s%s
%s\n", on, draw_special_char(DRAW_BLACK_CIRCLE), off, arg_host ? arg_host : hn);
printf(" State: %s%s%s\n",
on, strna(mi.state), off);
printf(" State: %s%s%s\n",
on, strna(mi.state), off);
@@
-4386,7
+4433,12
@@
static int show(sd_bus *bus, char **args) {
}
}
}
}
- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
+ r = show_one(args[0], bus, unit, show_properties,
+ &new_line, &ellipsized);
+ if (r < 0)
+ return r;
+ else if (r > 0 && ret == 0)
+ ret = r;
}
if (!strv_isempty(patterns)) {
}
if (!strv_isempty(patterns)) {
@@
-4403,7
+4455,12
@@
static int show(sd_bus *bus, char **args) {
if (!unit)
return log_oom();
if (!unit)
return log_oom();
- show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
+ r = show_one(args[0], bus, unit, show_properties,
+ &new_line, &ellipsized);
+ if (r < 0)
+ return r;
+ else if (r > 0 && ret == 0)
+ ret = r;
}
}
}
}
}
}
@@
-5242,7
+5299,7
@@
static int enable_unit(sd_bus *bus, char **args) {
if (r < 0)
return r;
if (r < 0)
return r;
- /* Try to reload if enab
el
d */
+ /* Try to reload if enab
le
d */
if (!arg_no_reload)
r = daemon_reload(bus, args);
else
if (!arg_no_reload)
r = daemon_reload(bus, args);
else
@@
-5403,15
+5460,15
@@
static int systemctl_help(void) {
" otherwise restart if active\n"
" isolate NAME Start one unit and stop all others\n"
" kill NAME... Send signal to processes of a unit\n"
" otherwise restart if active\n"
" isolate NAME Start one unit and stop all others\n"
" kill NAME... Send signal to processes of a unit\n"
- " is-active
NAME...
Check whether units are active\n"
- " is-failed
NAME...
Check whether units are failed\n"
- " status [
NAME...|PID...]
Show runtime status of one or more units\n"
- " show [
NAME...|JOB...]
Show properties of one or more\n"
+ " is-active
PATTERN...
Check whether units are active\n"
+ " is-failed
PATTERN...
Check whether units are failed\n"
+ " status [
PATTERN...|PID...]
Show runtime status of one or more units\n"
+ " show [
PATTERN...|JOB...]
Show properties of one or more\n"
" units/jobs or the manager\n"
" units/jobs or the manager\n"
- " cat
NAME...
Show files and drop-ins of one or more units\n"
+ " cat
PATTERN...
Show files and drop-ins of one or more units\n"
" set-property NAME ASSIGNMENT... Sets one or more properties of a unit\n"
" set-property NAME ASSIGNMENT... Sets one or more properties of a unit\n"
- " help
NAME...|PID...
Show manual for one or more units\n"
- " reset-failed [
NAME...]
Reset failed state for all, one, or more\n"
+ " help
PATTERN...|PID...
Show manual for one or more units\n"
+ " reset-failed [
PATTERN...]
Reset failed state for all, one, or more\n"
" units\n"
" list-dependencies [NAME] Recursively show units which are required\n"
" or wanted by this unit or by which this\n"
" units\n"
" list-dependencies [NAME] Recursively show units which are required\n"
" or wanted by this unit or by which this\n"
@@
-5973,13
+6030,10
@@
static int halt_parse_argv(int argc, char *argv[]) {
}
}
}
}
- if (arg_action == ACTION_REBOOT && argc == optind + 1) {
- r = write_string_file(REBOOT_PARAM_FILE, argv[optind]);
- if (r < 0) {
- log_error("Failed to write reboot param to "
- REBOOT_PARAM_FILE": %s", strerror(-r));
+ if (arg_action == ACTION_REBOOT && (argc == optind || argc == optind + 1)) {
+ r = update_reboot_param_file(argc == optind + 1 ? argv[optind] : NULL);
+ if (r < 0)
return r;
return r;
- }
} else if (optind < argc) {
log_error("Too many arguments.");
return -EINVAL;
} else if (optind < argc) {
log_error("Too many arguments.");
return -EINVAL;