X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl%2Fsystemctl.c;h=2fa8ecc6644fd567494e1d912f0f0472aceca973;hp=4690ba08f71e51a8ce056673ce2dd24054f02fed;hb=05cae7f3431446236139434ee58a6275f3cb31e8;hpb=b0d14c69b2907798ffde32b49b4f28a90242dbb7 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 4690ba08f..2fa8ecc66 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -77,7 +77,6 @@ static char **arg_types = NULL; static char **arg_states = NULL; static char **arg_properties = NULL; static bool arg_all = false; -static bool original_stdout_is_tty; static enum dependency { DEPENDENCY_FORWARD, DEPENDENCY_REVERSE, @@ -98,6 +97,7 @@ static bool arg_ignore_inhibitors = false; static bool arg_dry = false; static bool arg_quiet = false; static bool arg_full = false; +static bool arg_recursive = false; static int arg_force = 0; static bool arg_ask_password = true; static bool arg_runtime = false; @@ -135,6 +135,7 @@ static char *arg_host = NULL; static unsigned arg_lines = 10; static OutputMode arg_output = OUTPUT_SHORT; static bool arg_plain = false; + static const struct { const char *verb; const char *method; @@ -152,9 +153,10 @@ static const struct { { "force-reload", "ReloadOrTryRestartUnit" } }; +static bool original_stdout_is_tty; + static int daemon_reload(sd_bus *bus, char **args); static int halt_now(enum action a); - static int check_one_unit(sd_bus *bus, const char *name, const char *good_states, bool quiet); static char** strv_skip_first(char **strv) { @@ -257,7 +259,7 @@ static void warn_wall(enum action a) { } if (*p) { - utmp_wall(p, NULL); + utmp_wall(p, NULL, NULL); return; } } @@ -265,7 +267,7 @@ static void warn_wall(enum action a) { if (!table[a]) return; - utmp_wall(table[a], NULL); + utmp_wall(table[a], NULL, NULL); } static bool avoid_bus(void) { @@ -288,18 +290,29 @@ static bool avoid_bus(void) { static int compare_unit_info(const void *a, const void *b) { const UnitInfo *u = a, *v = b; const char *d1, *d2; + int r; + + /* First, order by machine */ + if (!u->machine && v->machine) + return -1; + if (u->machine && !v->machine) + return 1; + if (u->machine && v->machine) { + r = strcasecmp(u->machine, v->machine); + if (r != 0) + return r; + } + /* Second, order by unit type */ d1 = strrchr(u->id, '.'); d2 = strrchr(v->id, '.'); - if (d1 && d2) { - int r; - r = strcasecmp(d1, d2); if (r != 0) return r; } + /* Third, order by name */ return strcasecmp(u->id, v->id); } @@ -327,21 +340,21 @@ static bool output_show_unit(const UnitInfo *u, char **patterns) { || u->following[0]) || u->job_id > 0); } -static void output_units_list(const UnitInfo *unit_infos, unsigned c) { - unsigned id_len, max_id_len, load_len, active_len, sub_len, job_len, desc_len; +static int output_units_list(const UnitInfo *unit_infos, unsigned c) { + unsigned circle_len = 0, id_len, max_id_len, load_len, active_len, sub_len, job_len, desc_len; const UnitInfo *u; unsigned n_shown = 0; int job_count = 0; - max_id_len = sizeof("UNIT")-1; - load_len = sizeof("LOAD")-1; - active_len = sizeof("ACTIVE")-1; - sub_len = sizeof("SUB")-1; - job_len = sizeof("JOB")-1; + max_id_len = strlen("UNIT"); + load_len = strlen("LOAD"); + active_len = strlen("ACTIVE"); + sub_len = strlen("SUB"); + job_len = strlen("JOB"); desc_len = 0; for (u = unit_infos; u < unit_infos + c; u++) { - max_id_len = MAX(max_id_len, strlen(u->id)); + max_id_len = MAX(max_id_len, strlen(u->id) + (u->machine ? strlen(u->machine)+1 : 0)); load_len = MAX(load_len, strlen(u->load_state)); active_len = MAX(active_len, strlen(u->active_state)); sub_len = MAX(sub_len, strlen(u->sub_state)); @@ -350,13 +363,18 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { job_len = MAX(job_len, strlen(u->job_type)); job_count++; } + + if (!arg_no_legend && + (streq(u->active_state, "failed") || + STR_IN_SET(u->load_state, "error", "not-found", "masked"))) + circle_len = 2; } if (!arg_full && original_stdout_is_tty) { unsigned basic_len; id_len = MIN(max_id_len, 25u); - basic_len = 5 + id_len + 5 + active_len + sub_len; + basic_len = circle_len + 5 + id_len + 5 + active_len + sub_len; if (job_count) basic_len += job_len + 1; @@ -383,11 +401,18 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { id_len = max_id_len; for (u = unit_infos; u < unit_infos + c; u++) { - _cleanup_free_ char *e = NULL; - const char *on_loaded, *off_loaded, *on = ""; - const char *on_active, *off_active, *off = ""; + _cleanup_free_ char *e = NULL, *j = NULL; + const char *on_loaded = "", *off_loaded = ""; + const char *on_active = "", *off_active = ""; + const char *on_circle = "", *off_circle = ""; + const char *id; + bool circle = false; if (!n_shown && !arg_no_legend) { + + if (circle_len > 0) + fputs(" ", stdout); + printf("%-*s %-*s %-*s %-*s ", id_len, "UNIT", load_len, "LOAD", @@ -405,23 +430,41 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { n_shown++; - if (streq(u->load_state, "error") || - streq(u->load_state, "not-found")) { - on_loaded = on = ansi_highlight_red(); - off_loaded = off = ansi_highlight_off(); - } else - on_loaded = off_loaded = ""; + if (STR_IN_SET(u->load_state, "error", "not-found", "masked")) { + on_loaded = ansi_highlight_red(); + on_circle = ansi_highlight_yellow(); + off_loaded = off_circle = ansi_highlight_off(); + circle = true; + } if (streq(u->active_state, "failed")) { - on_active = on = ansi_highlight_red(); - off_active = off = ansi_highlight_off(); + on_circle = on_active = ansi_highlight_red(); + off_circle = off_active = ansi_highlight_off(); + circle = true; + } + + if (u->machine) { + j = strjoin(u->machine, ":", u->id, NULL); + if (!j) + return log_oom(); + + id = j; } else - on_active = off_active = ""; + id = u->id; + + if (arg_full) { + e = ellipsize(id, id_len, 33); + if (!e) + return log_oom(); + + id = e; + } - e = arg_full ? NULL : ellipsize(u->id, id_len, 33); + if (circle_len > 0) + 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, id_len, e ? e : u->id, off, + on_active, id_len, id, off_active, on_loaded, load_len, u->load_state, off_loaded, on_active, active_len, u->active_state, sub_len, u->sub_state, off_active, @@ -437,7 +480,8 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { const char *on, *off; if (n_shown) { - puts("\nLOAD = Reflects whether the unit definition was properly loaded.\n" + puts("\n" + "LOAD = Reflects whether the unit definition was properly loaded.\n" "ACTIVE = The high-level unit activation state, i.e. generalization of SUB.\n" "SUB = The low-level unit activation state, values depend on unit type."); puts(job_count ? "JOB = Pending job for the unit.\n" : ""); @@ -457,24 +501,27 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { "To show all installed unit files use 'systemctl list-unit-files'.\n", on, n_shown, off); } + + return 0; } static int get_unit_list( sd_bus *bus, - sd_bus_message **_reply, - UnitInfo **_unit_infos, - char **patterns) { + const char *machine, + char **patterns, + UnitInfo **unit_infos, + int c, + sd_bus_message **_reply) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_free_ UnitInfo *unit_infos = NULL; - size_t size = 0; - int r, c = 0; + size_t size = c; + int r; UnitInfo u; assert(bus); + assert(unit_infos); assert(_reply); - assert(_unit_infos); r = sd_bus_call_method( bus, @@ -495,13 +542,15 @@ static int get_unit_list( return bus_log_parse_error(r); while ((r = bus_parse_unit_info(reply, &u)) > 0) { + u.machine = machine; + if (!output_show_unit(&u, patterns)) continue; - if (!GREEDY_REALLOC(unit_infos, size, c+1)) + if (!GREEDY_REALLOC(*unit_infos, size, c+1)) return log_oom(); - unit_infos[c++] = u; + (*unit_infos)[c++] = u; } if (r < 0) return bus_log_parse_error(r); @@ -513,27 +562,108 @@ static int get_unit_list( *_reply = reply; reply = NULL; + return c; +} + +static void message_set_freep(Set **set) { + sd_bus_message *m; + + while ((m = set_steal_first(*set))) + sd_bus_message_unref(m); + + set_free(*set); +} + +static int get_unit_list_recursive( + sd_bus *bus, + char **patterns, + UnitInfo **_unit_infos, + Set **_replies, + char ***_machines) { + + _cleanup_free_ UnitInfo *unit_infos = NULL; + _cleanup_(message_set_freep) Set *replies; + sd_bus_message *reply; + int c, r; + + assert(bus); + assert(_replies); + assert(_unit_infos); + assert(_machines); + + replies = set_new(NULL, NULL); + if (!replies) + return log_oom(); + + c = get_unit_list(bus, NULL, patterns, &unit_infos, 0, &reply); + if (c < 0) + return c; + + r = set_put(replies, reply); + if (r < 0) { + sd_bus_message_unref(reply); + return r; + } + + if (arg_recursive) { + _cleanup_strv_free_ char **machines = NULL; + char **i; + + r = sd_get_machine_names(&machines); + if (r < 0) + return r; + + STRV_FOREACH(i, machines) { + _cleanup_bus_unref_ sd_bus *container = NULL; + int k; + + r = sd_bus_open_system_container(&container, *i); + if (r < 0) { + log_error("Failed to connect to container %s: %s", *i, strerror(-r)); + continue; + } + + k = get_unit_list(container, *i, patterns, &unit_infos, c, &reply); + if (k < 0) + return k; + + c = k; + + r = set_put(replies, reply); + if (r < 0) { + sd_bus_message_unref(reply); + return r; + } + } + + *_machines = machines; + machines = NULL; + } else + *_machines = NULL; + *_unit_infos = unit_infos; unit_infos = NULL; + *_replies = replies; + replies = NULL; + return c; } static int list_units(sd_bus *bus, char **args) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_free_ UnitInfo *unit_infos = NULL; + _cleanup_(message_set_freep) Set *replies = NULL; + _cleanup_strv_free_ char **machines = NULL; int r; pager_open_if_enabled(); - r = get_unit_list(bus, &reply, &unit_infos, strv_skip_first(args)); + r = get_unit_list_recursive(bus, strv_skip_first(args), &unit_infos, &replies, &machines); if (r < 0) return r; qsort_safe(unit_infos, r, sizeof(UnitInfo), compare_unit_info); - output_units_list(unit_infos, r); - - return 0; + return output_units_list(unit_infos, r); } static int get_triggered_units( @@ -610,6 +740,7 @@ static int get_listening( } struct socket_info { + const char *machine; const char* id; char* type; @@ -630,6 +761,16 @@ static int socket_info_compare(const struct socket_info *a, const struct socket_ 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); @@ -639,10 +780,10 @@ static int socket_info_compare(const struct socket_info *a, const struct socket_ static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) { struct socket_info *s; - unsigned pathlen = sizeof("LISTEN") - 1, - typelen = (sizeof("TYPE") - 1) * arg_show_types, - socklen = sizeof("UNIT") - 1, - servlen = sizeof("ACTIVATES") - 1; + unsigned pathlen = strlen("LISTEN"), + typelen = strlen("TYPE") * arg_show_types, + socklen = strlen("UNIT"), + servlen = strlen("ACTIVATES"); const char *on, *off; for (s = socket_infos; s < socket_infos + cs; s++) { @@ -652,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)); - 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); @@ -668,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++) { + _cleanup_free_ char *j = NULL; + const char *path; 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", - pathlen, s->path, typelen, s->type, socklen, s->id); + pathlen, path, typelen, s->type, socklen, s->id); 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); @@ -701,7 +852,8 @@ static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) { } 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; @@ -712,7 +864,7 @@ static int list_sockets(sd_bus *bus, char **args) { pager_open_if_enabled(); - n = get_unit_list(bus, &reply, &unit_infos, strv_skip_first(args)); + n = get_unit_list_recursive(bus, strv_skip_first(args), &unit_infos, &replies, &machines); if (n < 0) return n; @@ -740,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) { + .machine = u->machine, .id = u->id, .type = listening[i*2], .path = listening[i*2 + 1], @@ -815,16 +968,59 @@ static int get_next_elapse( return 0; } +static int get_last_trigger( + sd_bus *bus, + const char *path, + usec_t *last) { + + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int r; + + assert(bus); + assert(path); + assert(last); + + r = sd_bus_get_property_trivial( + bus, + "org.freedesktop.systemd1", + path, + "org.freedesktop.systemd1.Timer", + "LastTriggerUSec", + &error, + 't', + last); + if (r < 0) { + log_error("Failed to get last trigger time: %s", bus_error_message(&error, r)); + return r; + } + + return 0; +} + struct timer_info { + const char* machine; const char* id; usec_t next_elapse; + usec_t last_trigger; char** triggered; }; static int timer_info_compare(const struct timer_info *a, const struct timer_info *b) { + int o; + 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) @@ -836,10 +1032,12 @@ static int timer_info_compare(const struct timer_info *a, const struct timer_inf static int output_timers_list(struct timer_info *timer_infos, unsigned n) { struct timer_info *t; unsigned - nextlen = sizeof("NEXT") - 1, - leftlen = sizeof("LEFT") - 1, - unitlen = sizeof("UNIT") - 1, - activatelen = sizeof("ACTIVATES") - 1; + nextlen = strlen("NEXT"), + leftlen = strlen("LEFT"), + lastlen = strlen("LAST"), + passedlen = strlen("PASSED"), + unitlen = strlen("UNIT"), + activatelen = strlen("ACTIVATES"); const char *on, *off; @@ -859,30 +1057,57 @@ static int output_timers_list(struct timer_info *timer_infos, unsigned n) { leftlen = MAX(leftlen, strlen(trel)); } - unitlen = MAX(unitlen, strlen(t->id)); + if (t->last_trigger > 0) { + char tstamp[FORMAT_TIMESTAMP_MAX] = "", trel[FORMAT_TIMESTAMP_RELATIVE_MAX] = ""; + + format_timestamp(tstamp, sizeof(tstamp), t->last_trigger); + lastlen = MAX(lastlen, strlen(tstamp) + 1); + + format_timestamp_relative(trel, sizeof(trel), t->last_trigger); + passedlen = MAX(passedlen, strlen(trel)); + } + + 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); + activatelen = MAX(activatelen, ul); } if (n > 0) { if (!arg_no_legend) - printf("%-*s %-*s %-*s %s\n", - nextlen, "NEXT", - leftlen, "LEFT", - unitlen, "UNIT", - "ACTIVATES"); + printf("%-*s %-*s %-*s %-*s %-*s %s\n", + nextlen, "NEXT", + leftlen, "LEFT", + lastlen, "LAST", + passedlen, "PASSED", + unitlen, "UNIT", + "ACTIVATES"); for (t = timer_infos; t < timer_infos + n; t++) { - char tstamp[FORMAT_TIMESTAMP_MAX] = "n/a", trel[FORMAT_TIMESTAMP_RELATIVE_MAX] = "n/a"; + _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; - format_timestamp(tstamp, sizeof(tstamp), t->next_elapse); - format_timestamp_relative(trel, sizeof(trel), t->next_elapse); + format_timestamp(tstamp1, sizeof(tstamp1), t->next_elapse); + format_timestamp_relative(trel1, sizeof(trel1), t->next_elapse); - printf("%-*s %-*s %-*s", - nextlen, tstamp, leftlen, trel, unitlen, t->id); + 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", + nextlen, tstamp1, leftlen, trel1, lastlen, tstamp2, passedlen, trel2, unitlen, unit); STRV_FOREACH(a, t->triggered) printf("%s %s", @@ -934,8 +1159,8 @@ static usec_t calc_next_elapse(dual_timestamp *nw, dual_timestamp *next) { } 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; @@ -947,7 +1172,7 @@ static int list_timers(sd_bus *bus, char **args) { pager_open_if_enabled(); - n = get_unit_list(bus, &reply, &unit_infos, strv_skip_first(args)); + n = get_unit_list_recursive(bus, strv_skip_first(args), &unit_infos, &replies, &machines); if (n < 0) return n; @@ -956,7 +1181,7 @@ static int list_timers(sd_bus *bus, char **args) { for (u = unit_infos; u < unit_infos + n; u++) { _cleanup_strv_free_ char **triggered = NULL; dual_timestamp next = {}; - usec_t m; + usec_t m, last = 0; if (!endswith(u->id, ".timer")) continue; @@ -969,6 +1194,8 @@ static int list_timers(sd_bus *bus, char **args) { if (r < 0) goto cleanup; + get_last_trigger(bus, u->unit_path, &last); + if (!GREEDY_REALLOC(timer_infos, size, c+1)) { r = log_oom(); goto cleanup; @@ -977,8 +1204,10 @@ static int list_timers(sd_bus *bus, char **args) { m = calc_next_elapse(&nw, &next); timer_infos[c++] = (struct timer_info) { + .machine = u->machine, .id = u->id, .next_elapse = m, + .last_trigger = last, .triggered = triggered, }; @@ -1034,8 +1263,8 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) { unsigned max_id_len, id_cols, state_cols; const UnitFileList *u; - max_id_len = sizeof("UNIT FILE")-1; - state_cols = sizeof("STATE")-1; + max_id_len = strlen("UNIT FILE"); + state_cols = strlen("STATE"); for (u = units; u < units + c; u++) { max_id_len = MAX(max_id_len, strlen(basename(u->path))); @@ -1201,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", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERT : DRAW_TREE_SPACE)); + printf("%s", draw_special_char(branches & (1 << i) ? DRAW_TREE_VERTICAL : DRAW_TREE_SPACE)); } len += 2; @@ -1369,9 +1598,9 @@ static int list_dependencies_one( 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 - 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) @@ -1450,7 +1679,7 @@ static int compare_machine_info(const void *a, const void *b) { const struct machine_info *u = a, *v = b; if (u->is_host != v->is_host) - return u->is_host > v->is_host ? 1 : -1; + return u->is_host > v->is_host ? -1 : 1; return strcasecmp(u->name, v->name); } @@ -1553,6 +1782,7 @@ static int get_machine_list( static void output_machines_list(struct machine_info *machine_infos, unsigned n) { struct machine_info *m; unsigned + circle_len = 0, namelen = sizeof("NAME") - 1, statelen = sizeof("STATE") - 1, failedlen = sizeof("FAILED") - 1, @@ -1565,26 +1795,36 @@ static void output_machines_list(struct machine_info *machine_infos, unsigned n) statelen = MAX(statelen, m->state ? strlen(m->state) : 0); failedlen = MAX(failedlen, DECIMAL_STR_WIDTH(m->n_failed_units)); jobslen = MAX(jobslen, DECIMAL_STR_WIDTH(m->n_jobs)); + + if (!arg_no_legend && !streq_ptr(m->state, "running")) + circle_len = 2; } - if (!arg_no_legend) + if (!arg_no_legend) { + if (circle_len > 0) + fputs(" ", stdout); + printf("%-*s %-*s %-*s %-*s\n", namelen, "NAME", statelen, "STATE", failedlen, "FAILED", jobslen, "JOBS"); + } for (m = machine_infos; m < machine_infos + n; m++) { - const char *on_state, *off_state, *on_failed, *off_failed; + const char *on_state = "", *off_state = ""; + const char *on_failed = "", *off_failed = ""; + bool circle = false; if (streq_ptr(m->state, "degraded")) { on_state = ansi_highlight_red(); off_state = ansi_highlight_off(); + circle = true; } else if (!streq_ptr(m->state, "running")) { on_state = ansi_highlight_yellow(); off_state = ansi_highlight_off(); - } else - on_state = off_state = ""; + circle = true; + } if (m->n_failed_units > 0) { on_failed = ansi_highlight_red(); @@ -1592,6 +1832,9 @@ static void output_machines_list(struct machine_info *machine_infos, unsigned n) } else on_failed = off_failed = ""; + if (circle_len > 0) + 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", (int) (namelen - (sizeof(" (host)")-1)), strna(m->name), @@ -1725,7 +1968,7 @@ static int set_default(sd_bus *bus, char **args) { return log_oom(); if (!bus || avoid_bus()) { - r = unit_file_set_default(arg_scope, arg_root, unit, arg_force, &changes, &n_changes); + r = unit_file_set_default(arg_scope, arg_root, unit, true, &changes, &n_changes); if (r < 0) { log_error("Failed to set default target: %s", strerror(-r)); return r; @@ -1747,7 +1990,7 @@ static int set_default(sd_bus *bus, char **args) { "SetDefaultTarget", &error, &reply, - "sb", unit, arg_force); + "sb", unit, true); if (r < 0) { log_error("Failed to set default target: %s", bus_error_message(&error, -r)); return r; @@ -1757,7 +2000,7 @@ static int set_default(sd_bus *bus, char **args) { if (r < 0) return r; - /* Try to reload if enabeld */ + /* Try to reload if enabled */ if (!arg_no_reload) r = daemon_reload(bus, args); else @@ -1792,10 +2035,10 @@ static void output_jobs_list(const struct job_info* jobs, unsigned n, bool skipp pager_open_if_enabled(); - id_len = sizeof("JOB")-1; - unit_len = sizeof("UNIT")-1; - type_len = sizeof("TYPE")-1; - state_len = sizeof("STATE")-1; + id_len = strlen("JOB"); + unit_len = strlen("UNIT"); + type_len = strlen("TYPE"); + state_len = strlen("STATE"); for (j = jobs; j < jobs + n; j++) { uint32_t id = j->id; @@ -2062,6 +2305,7 @@ static int enable_wait_for_jobs(sd_bus *bus) { r = sd_bus_add_match( bus, + NULL, "type='signal'," "sender='org.freedesktop.systemd1'," "interface='org.freedesktop.systemd1.Manager'," @@ -2121,13 +2365,14 @@ static int check_wait_response(WaitData *d) { } static int wait_for_jobs(sd_bus *bus, Set *s) { + _cleanup_bus_slot_unref_ sd_bus_slot *slot = NULL; WaitData d = { .set = s }; int r = 0, q; assert(bus); assert(s); - q = sd_bus_add_filter(bus, wait_filter, &d); + q = sd_bus_add_filter(bus, &slot, wait_filter, &d); if (q < 0) return log_oom(); @@ -2155,10 +2400,6 @@ static int wait_for_jobs(sd_bus *bus, Set *s) { d.result = NULL; } - q = sd_bus_remove_filter(bus, wait_filter, &d); - if (q < 0 && r == 0) - r = q; - return r; } @@ -2372,7 +2613,6 @@ static int start_unit_one( static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***ret) { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_strv_free_ char **mangled = NULL, **globs = NULL; char **name; int r = 0, i; @@ -2398,9 +2638,10 @@ static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***r /* Query the manager only if any of the names are a glob, since * this is fairly expensive */ if (!strv_isempty(globs)) { + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_free_ UnitInfo *unit_infos = NULL; - r = get_unit_list(bus, &reply, &unit_infos, globs); + r = get_unit_list(bus, NULL, globs, &unit_infos, 0, &reply); if (r < 0) return r; @@ -2411,6 +2652,7 @@ static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***r *ret = mangled; mangled = NULL; /* do not free */ + return 0; } @@ -2642,8 +2884,8 @@ static int check_inhibitors(sd_bus *bus, enum action a) { get_process_comm(pid, &comm); user = uid_to_name(uid); - log_warning("Operation inhibited by \"%s\" (PID %lu \"%s\", user %s), reason is \"%s\".", - who, (unsigned long) pid, strna(comm), strna(user), why); + log_warning("Operation inhibited by \"%s\" (PID "PID_FMT" \"%s\", user %s), reason is \"%s\".", + who, pid, strna(comm), strna(user), why); c++; } @@ -2990,7 +3232,7 @@ static void print_status_info( } 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); @@ -3226,7 +3468,6 @@ static void print_status_info( } if (i->id && arg_transport == BUS_TRANSPORT_LOCAL) { - printf("\n"); show_journal_by_unit(stdout, i->id, arg_output, @@ -3234,7 +3475,7 @@ static void print_status_info( i->inactive_exit_timestamp_monotonic, arg_lines, getuid(), - flags, + flags | OUTPUT_BEGIN_NEWLINE, arg_scope == UNIT_FILE_SYSTEM, ellipsized); } @@ -4015,7 +4256,7 @@ static int get_unit_dbus_path_by_pid( &reply, "u", pid); if (r < 0) { - log_error("Failed to get unit for PID %lu: %s", (unsigned long) pid, bus_error_message(&error, r)); + log_error("Failed to get unit for PID "PID_FMT": %s", pid, bus_error_message(&error, r)); return r; } @@ -4042,9 +4283,9 @@ static int show_all( _cleanup_free_ UnitInfo *unit_infos = NULL; const UnitInfo *u; unsigned c; - int r; + int r, ret = 0; - r = get_unit_list(bus, &reply, &unit_infos, NULL); + r = get_unit_list(bus, NULL, NULL, &unit_infos, 0, &reply); if (r < 0) return r; @@ -4062,105 +4303,13 @@ static int show_all( return log_oom(); r = show_one(verb, bus, p, show_properties, new_line, ellipsized); - if (r != 0) + if (r < 0) return r; + else if (r > 0 && ret == 0) + ret = r; } - return 0; -} - -static int cat(sd_bus *bus, char **args) { - _cleanup_free_ char *unit = NULL; - _cleanup_strv_free_ char **names = NULL; - char **name; - bool first = true; - int r = 0; - - assert(bus); - assert(args); - - r = expand_names(bus, args + 1, NULL, &names); - if (r < 0) - log_error("Failed to expand names: %s", strerror(-r)); - - pager_open_if_enabled(); - - STRV_FOREACH(name, names) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_strv_free_ char **dropin_paths = NULL; - _cleanup_free_ char *fragment_path = NULL; - char **path; - - unit = unit_dbus_path_from_name(*name); - if (!unit) - return log_oom(); - - if (need_daemon_reload(bus, *name) > 0) - log_warning("Unit file of %s changed on disk. Run 'systemctl%s daemon-reload'.", - *name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); - - r = sd_bus_get_property_string( - bus, - "org.freedesktop.systemd1", - unit, - "org.freedesktop.systemd1.Unit", - "FragmentPath", - &error, - &fragment_path); - if (r < 0) { - log_warning("Failed to get FragmentPath: %s", bus_error_message(&error, r)); - continue; - } - - r = sd_bus_get_property_strv( - bus, - "org.freedesktop.systemd1", - unit, - "org.freedesktop.systemd1.Unit", - "DropInPaths", - &error, - &dropin_paths); - if (r < 0) { - log_warning("Failed to get DropInPaths: %s", bus_error_message(&error, r)); - continue; - } - - if (first) - first = false; - else - puts(""); - - if (!isempty(fragment_path)) { - printf("%s# %s%s\n", - ansi_highlight_blue(), - fragment_path, - ansi_highlight_off()); - fflush(stdout); - - r = sendfile_full(STDOUT_FILENO, fragment_path); - if (r < 0) { - log_warning("Failed to cat %s: %s", fragment_path, strerror(-r)); - continue; - } - } - - STRV_FOREACH(path, dropin_paths) { - printf("%s%s# %s%s\n", - isempty(fragment_path) && path == dropin_paths ? "" : "\n", - ansi_highlight_blue(), - *path, - ansi_highlight_off()); - fflush(stdout); - - r = sendfile_full(STDOUT_FILENO, *path); - if (r < 0) { - log_warning("Failed to cat %s: %s", *path, strerror(-r)); - continue; - } - } - } - - return r < 0 ? r : 0; + return ret; } static int show_system_status(sd_bus *bus) { @@ -4189,7 +4338,7 @@ static int show_system_status(sd_bus *bus) { } 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); @@ -4249,9 +4398,7 @@ static int show(sd_bus *bus, char **args) { if (show_status && strv_length(args) <= 1) { - if (arg_all) - pager_open_if_enabled(); - + pager_open_if_enabled(); show_system_status(bus); new_line = true; @@ -4284,7 +4431,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)) { @@ -4301,7 +4453,12 @@ static int show(sd_bus *bus, char **args) { 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; } } } @@ -4312,6 +4469,100 @@ static int show(sd_bus *bus, char **args) { return ret; } +static int cat(sd_bus *bus, char **args) { + _cleanup_free_ char *unit = NULL; + _cleanup_strv_free_ char **names = NULL; + char **name; + bool first = true; + int r = 0; + + assert(bus); + assert(args); + + r = expand_names(bus, args + 1, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); + + pager_open_if_enabled(); + + STRV_FOREACH(name, names) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_strv_free_ char **dropin_paths = NULL; + _cleanup_free_ char *fragment_path = NULL; + char **path; + + unit = unit_dbus_path_from_name(*name); + if (!unit) + return log_oom(); + + if (need_daemon_reload(bus, *name) > 0) + log_warning("Unit file of %s changed on disk. Run 'systemctl%s daemon-reload'.", + *name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); + + r = sd_bus_get_property_string( + bus, + "org.freedesktop.systemd1", + unit, + "org.freedesktop.systemd1.Unit", + "FragmentPath", + &error, + &fragment_path); + if (r < 0) { + log_warning("Failed to get FragmentPath: %s", bus_error_message(&error, r)); + continue; + } + + r = sd_bus_get_property_strv( + bus, + "org.freedesktop.systemd1", + unit, + "org.freedesktop.systemd1.Unit", + "DropInPaths", + &error, + &dropin_paths); + if (r < 0) { + log_warning("Failed to get DropInPaths: %s", bus_error_message(&error, r)); + continue; + } + + if (first) + first = false; + else + puts(""); + + if (!isempty(fragment_path)) { + printf("%s# %s%s\n", + ansi_highlight_blue(), + fragment_path, + ansi_highlight_off()); + fflush(stdout); + + r = sendfile_full(STDOUT_FILENO, fragment_path); + if (r < 0) { + log_warning("Failed to cat %s: %s", fragment_path, strerror(-r)); + continue; + } + } + + STRV_FOREACH(path, dropin_paths) { + printf("%s%s# %s%s\n", + isempty(fragment_path) && path == dropin_paths ? "" : "\n", + ansi_highlight_blue(), + *path, + ansi_highlight_off()); + fflush(stdout); + + r = sendfile_full(STDOUT_FILENO, *path); + if (r < 0) { + log_warning("Failed to cat %s: %s", *path, strerror(-r)); + continue; + } + } + } + + return r < 0 ? r : 0; +} + static int set_property(sd_bus *bus, char **args) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -4751,18 +5002,18 @@ static int enable_sysv_units(const char *verb, char **args) { /* Processes all SysV units, and reshuffles the array so that * afterwards only the native units remain */ - r = lookup_paths_init(&paths, SYSTEMD_SYSTEM, false, NULL, NULL, NULL); + r = lookup_paths_init(&paths, SYSTEMD_SYSTEM, false, arg_root, NULL, NULL, NULL); if (r < 0) return r; r = 0; for (f = 0; args[f]; f++) { const char *name; - _cleanup_free_ char *p = NULL, *q = NULL; + _cleanup_free_ char *p = NULL, *q = NULL, *l = NULL; bool found_native = false, found_sysv; unsigned c = 1; const char *argv[6] = { "/sbin/chkconfig", NULL, NULL, NULL, NULL }; - char **k, *l; + char **k; int j; pid_t pid; siginfo_t status; @@ -4776,6 +5027,8 @@ static int enable_sysv_units(const char *verb, char **args) { continue; STRV_FOREACH(k, paths.unit_path) { + _cleanup_free_ char *path = NULL; + if (!isempty(arg_root)) asprintf(&p, "%s/%s/%s", arg_root, *k, name); else @@ -4787,9 +5040,6 @@ static int enable_sysv_units(const char *verb, char **args) { } found_native = access(p, F_OK) >= 0; - free(p); - p = NULL; - if (found_native) break; } @@ -4806,9 +5056,8 @@ static int enable_sysv_units(const char *verb, char **args) { goto finish; } - p[strlen(p) - sizeof(".service") + 1] = 0; + p[strlen(p) - strlen(".service")] = 0; found_sysv = access(p, F_OK) >= 0; - if (!found_sysv) continue; @@ -4833,7 +5082,6 @@ static int enable_sysv_units(const char *verb, char **args) { } log_info("Executing %s", l); - free(l); pid = fork(); if (pid < 0) { @@ -5046,7 +5294,7 @@ static int enable_unit(sd_bus *bus, char **args) { if (r < 0) return r; - /* Try to reload if enabeld */ + /* Try to reload if enabled */ if (!arg_no_reload) r = daemon_reload(bus, args); else @@ -5165,6 +5413,7 @@ static int systemctl_help(void) { " ones. To list all units installed on the system, use\n" " the 'list-unit-files' command instead.\n" " -l --full Don't ellipsize unit names on output\n" + " -r --recursive Show unit list of host and local containers\n" " --reverse Show reverse dependencies with 'list-dependencies'\n" " --job-mode=MODE Specify how to deal with already queued jobs, when\n" " queueing a new job\n" @@ -5206,15 +5455,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" - " 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" - " 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" - " 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" @@ -5415,6 +5664,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "output", required_argument, NULL, 'o' }, { "plain", no_argument, NULL, ARG_PLAIN }, { "state", required_argument, NULL, ARG_STATE }, + { "recursive", no_argument, NULL, 'r' }, {} }; @@ -5423,7 +5673,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:M:n:o:i", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "ht:p:alqfs:H:M:n:o:ir", options, NULL)) >= 0) { switch (c) { @@ -5671,6 +5921,15 @@ static int systemctl_parse_argv(int argc, char *argv[]) { break; } + case 'r': + if (geteuid() != 0) { + log_error("--recursive requires root priviliges."); + return -EPERM; + } + + arg_recursive = true; + break; + case '?': return -EINVAL; @@ -5766,13 +6025,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; - } } else if (optind < argc) { log_error("Too many arguments."); return -EINVAL; @@ -6335,7 +6591,7 @@ static int send_shutdownd(usec_t t, char mode, bool dry_run, bool warn, const ch struct msghdr msghdr = { .msg_name = &sockaddr, .msg_namelen = offsetof(struct sockaddr_un, sun_path) - + sizeof("/run/systemd/shutdownd") - 1, + + strlen("/run/systemd/shutdownd"), .msg_iov = iovec, .msg_iovlen = 1, };