X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl.c;h=de41db79e2eb4e5bcd9bef7733fae1bae2476f04;hp=cf075ed7a3d6ab186ea23f2a9b8e7fc0c05f996a;hb=f73e33d9ecdd5f97f31a3efcca254519eef5b7ea;hpb=598b557bf0dea33db2c13d383382efbd847ed5f0 diff --git a/src/systemctl.c b/src/systemctl.c index cf075ed7a..de41db79e 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -49,6 +49,8 @@ #include "path-lookup.h" #include "conf-parser.h" #include "sd-daemon.h" +#include "shutdownd.h" +#include "exit-status.h" static const char *arg_type = NULL; static char **arg_property = NULL; @@ -67,7 +69,13 @@ static bool arg_quiet = false; static bool arg_full = false; static bool arg_force = false; static bool arg_defaults = false; +static bool arg_sysv_compat = false; /* this is undocumented, and + * exists simply to make + * implementation of SysV + * compatible shell glue + * easier */ static char **arg_wall = NULL; +static usec_t arg_when = 0; static enum action { ACTION_INVALID, ACTION_SYSTEMCTL, @@ -84,6 +92,7 @@ static enum action { ACTION_RELOAD, ACTION_REEXEC, ACTION_RUNLEVEL, + ACTION_CANCEL_SHUTDOWN, _ACTION_MAX } arg_action = ACTION_SYSTEMCTL; static enum dot { @@ -121,8 +130,7 @@ static const char *ansi_highlight_green(bool b) { return b ? ANSI_HIGHLIGHT_GREEN_ON : ANSI_HIGHLIGHT_OFF; } -static bool error_is_no_service(DBusError *error) { - +static bool error_is_no_service(const DBusError *error) { assert(error); if (!dbus_error_is_set(error)) @@ -188,12 +196,43 @@ static void warn_wall(enum action action) { utmp_wall(table[action]); } +struct unit_info { + const char *id; + const char *description; + const char *load_state; + const char *active_state; + const char *sub_state; + const char *following; + const char *unit_path; + uint32_t job_id; + const char *job_type; + const char *job_path; +}; + +static int compare_unit_info(const void *a, const void *b) { + const char *d1, *d2; + const struct unit_info *u = a, *v = b; + + d1 = strrchr(u->id, '.'); + d2 = strrchr(v->id, '.'); + + if (d1 && d2) { + int r; + + if ((r = strcasecmp(d1, d2)) != 0) + return r; + } + + return strcasecmp(u->id, v->id); +} + static int list_units(DBusConnection *bus, char **args, unsigned n) { DBusMessage *m = NULL, *reply = NULL; DBusError error; int r; DBusMessageIter iter, sub, sub2; - unsigned k = 0; + unsigned c = 0, k, n_units = 0; + struct unit_info *unit_infos = NULL; dbus_error_init(&error); @@ -209,7 +248,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -224,12 +263,8 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { dbus_message_iter_recurse(&iter, &sub); - if (isatty(STDOUT_FILENO)) - printf("%-45s %-6s %-12s %-12s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION"); - while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { - const char *id, *description, *load_state, *active_state, *sub_state, *following, *unit_path, *job_type, *job_path, *dot; - uint32_t job_id; + struct unit_info *u; if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { log_error("Failed to parse reply."); @@ -237,72 +272,120 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { goto finish; } + if (c >= n_units) { + struct unit_info *w; + + n_units = MAX(2*c, 16); + w = realloc(unit_infos, sizeof(struct unit_info) * n_units); + + if (!w) { + log_error("Failed to allocate unit array."); + r = -ENOMEM; + goto finish; + } + + unit_infos = w; + } + + u = unit_infos+c; + dbus_message_iter_recurse(&sub, &sub2); - if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &id, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &description, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &load_state, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &active_state, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &sub_state, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &following, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &unit_path, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &job_id, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &job_type, true) < 0 || - bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &job_path, false) < 0) { + if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->id, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->description, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->load_state, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->active_state, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->sub_state, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->following, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &u->unit_path, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &u->job_id, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &u->job_type, true) < 0 || + bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &u->job_path, false) < 0) { log_error("Failed to parse reply."); r = -EIO; goto finish; } - if ((!arg_type || ((dot = strrchr(id, '.')) && + dbus_message_iter_next(&sub); + c++; + } + + qsort(unit_infos, c, sizeof(struct unit_info), compare_unit_info); + + if (isatty(STDOUT_FILENO)) { + if (columns() >= 80+12 || arg_full) + printf("%-25s %-6s %-12s %-18s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION"); + else + printf("%-25s %-6s %-12s %-18s %-15s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB"); + } + + for (k = 0; k < c; k++) { + const char *dot; + struct unit_info *u = unit_infos+k; + + if ((!arg_type || ((dot = strrchr(u->id, '.')) && streq(dot+1, arg_type))) && - (arg_all || !(streq(active_state, "inactive") || following[0]) || job_id > 0)) { + (arg_all || !(streq(u->active_state, "inactive") || u->following[0]) || u->job_id > 0)) { char *e; int a = 0, b = 0; - const char *on, *off; + const char *on_loaded, *off_loaded; + const char *on_active, *off_active; - if (streq(active_state, "maintenance")) { - on = ansi_highlight(true); - off = ansi_highlight(false); + if (!streq(u->load_state, "loaded")) { + on_loaded = ansi_highlight(true); + off_loaded = ansi_highlight(false); } else - on = off = ""; + on_loaded = off_loaded = ""; + + if (streq(u->active_state, "failed")) { + on_active = ansi_highlight(true); + off_active = ansi_highlight(false); + } else + on_active = off_active = ""; + + e = arg_full ? NULL : ellipsize(u->id, 25, 33); + + printf("%-25s %s%-6s%s %s%-12s %-18s%s%n", + e ? e : u->id, + on_loaded, u->load_state, off_loaded, + on_active, u->active_state, u->sub_state, off_active, + &a); - e = arg_full ? NULL : ellipsize(id, 45, 33); - printf("%-45s %-6s %s%-12s %-12s%s%n", e ? e : id, load_state, on, active_state, sub_state, off, &a); free(e); - a -= strlen(on) + strlen(off); + a -= strlen(on_loaded) + strlen(off_loaded); + a -= strlen(on_active) + strlen(off_active); - if (job_id != 0) - printf(" => %-12s%n", job_type, &b); + if (u->job_id != 0) + printf(" %-15s%n", u->job_type, &b); else b = 1 + 15; - if (a + b + 2 < columns()) { - if (job_id == 0) + if (a + b + 1 < columns()) { + if (u->job_id == 0) printf(" "); - printf(" %.*s", columns() - a - b - 2, description); + if (arg_full) + printf(" %s", u->description); + else + printf(" %.*s", columns() - a - b - 1, u->description); } fputs("\n", stdout); - k++; } - - dbus_message_iter_next(&sub); } if (isatty(STDOUT_FILENO)) { - printf("\nLOAD = Load State, reflects whether the unit configuration was properly loaded.\n" - "ACTIVE = Active State, the high-level unit activation state, i.e. generalization of the substate.\n" - "SUB = Substate, the low-level unit activation state, possible values depend on unit type.\n" - "JOB = Job, shows pending jobs for the unit.\n"); + printf("\nLOAD = 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.\n" + "JOB = Pending job for the unit.\n"); if (arg_all) - printf("\n%u units listed.\n", k); + printf("\n%u units listed.\n", c); else - printf("\n%u units listed. Pass --all to see inactive units, too.\n", k); + printf("\n%u units listed. Pass --all to see inactive units, too.\n", c); } r = 0; @@ -314,6 +397,8 @@ finish: if (reply) dbus_message_unref(reply); + free(unit_infos); + dbus_error_free(&error); return r; @@ -408,7 +493,7 @@ static int dot_one(DBusConnection *bus, const char *name, const char *path) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -491,7 +576,7 @@ static int dot(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -584,7 +669,7 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -599,7 +684,8 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) { dbus_message_iter_recurse(&iter, &sub); - printf("%4s %-45s %-17s %-7s\n", "JOB", "UNIT", "TYPE", "STATE"); + if (isatty(STDOUT_FILENO)) + printf("%4s %-25s %-15s %-7s\n", "JOB", "UNIT", "TYPE", "STATE"); while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { const char *name, *type, *state, *job_path, *unit_path; @@ -625,8 +711,8 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) { goto finish; } - e = arg_full ? NULL : ellipsize(name, 45, 33); - printf("%4u %-45s %-17s %-7s\n", id, e ? e : name, type, state); + e = arg_full ? NULL : ellipsize(name, 25, 33); + printf("%4u %-25s %-15s %-7s\n", id, e ? e : name, type, state); free(e); k++; @@ -634,7 +720,9 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) { dbus_message_iter_next(&sub); } - printf("\n%u jobs listed.\n", k); + if (isatty(STDOUT_FILENO)) + printf("\n%u jobs listed.\n", k); + r = 0; finish: @@ -681,7 +769,7 @@ static int load_unit(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -749,7 +837,7 @@ static int cancel_job(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -757,7 +845,7 @@ static int cancel_job(DBusConnection *bus, char **args, unsigned n) { if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -775,7 +863,7 @@ static int cancel_job(DBusConnection *bus, char **args, unsigned n) { dbus_message_unref(reply); if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -904,7 +992,7 @@ static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_BOOLEAN, &success, DBUS_TYPE_INVALID)) - log_error("Failed to parse message: %s", error.message); + log_error("Failed to parse message: %s", bus_error_message(&error)); else { char *p; @@ -938,7 +1026,7 @@ static int enable_wait_for_jobs(DBusConnection *bus) { &error); if (dbus_error_is_set(&error)) { - log_error("Failed to add match: %s", error.message); + log_error("Failed to add match: %s", bus_error_message(&error)); dbus_error_free(&error); return -EIO; } @@ -1027,7 +1115,7 @@ static int start_unit_one( goto finish; } - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -1035,7 +1123,7 @@ static int start_unit_one( if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -1171,7 +1259,10 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { } if (!arg_no_block) - r = wait_for_jobs(bus, s); + if ((r = wait_for_jobs(bus, s)) < 0) + goto finish; + + r = 1; finish: if (s) @@ -1244,7 +1335,7 @@ static int check_unit(DBusConnection *bus, char **args, unsigned n) { if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -1271,7 +1362,7 @@ static int check_unit(DBusConnection *bus, char **args, unsigned n) { dbus_message_unref(reply); if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -1296,7 +1387,7 @@ static int check_unit(DBusConnection *bus, char **args, unsigned n) { if (!arg_quiet) puts(state); - if (streq(state, "active") || startswith(state, "reloading")) + if (streq(state, "active") || streq(state, "reloading")) r = 0; dbus_message_unref(m); @@ -1421,13 +1512,19 @@ typedef struct UnitStatusInfo { const char *path; const char *default_control_group; + usec_t inactive_exit_timestamp; + usec_t active_enter_timestamp; + usec_t active_exit_timestamp; + usec_t inactive_enter_timestamp; + bool need_daemon_reload; /* Service */ pid_t main_pid; pid_t control_pid; const char *status_text; - bool running; + bool running:1; + bool is_sysv:1; usec_t start_timestamp; usec_t exit_timestamp; @@ -1454,6 +1551,9 @@ typedef struct UnitStatusInfo { static void print_status_info(UnitStatusInfo *i) { ExecStatusInfo *p; const char *on, *off, *ss; + usec_t timestamp; + char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1; + char since2[FORMAT_TIMESTAMP_MAX], *s2; assert(i); @@ -1480,7 +1580,7 @@ static void print_status_info(UnitStatusInfo *i) { ss = streq_ptr(i->active_state, i->sub_state) ? NULL : i->sub_state; - if (streq_ptr(i->active_state, "maintenance")) { + if (streq_ptr(i->active_state, "failed")) { on = ansi_highlight(true); off = ansi_highlight(false); } else if (streq_ptr(i->active_state, "active") || streq_ptr(i->active_state, "reloading")) { @@ -1490,17 +1590,34 @@ static void print_status_info(UnitStatusInfo *i) { on = off = ""; if (ss) - printf("\t Active: %s%s (%s)%s\n", + printf("\t Active: %s%s (%s)%s", on, strna(i->active_state), ss, off); else - printf("\t Active: %s%s%s\n", + printf("\t Active: %s%s%s", on, strna(i->active_state), off); + timestamp = (streq_ptr(i->active_state, "active") || + streq_ptr(i->active_state, "reloading")) ? i->active_enter_timestamp : + (streq_ptr(i->active_state, "inactive") || + streq_ptr(i->active_state, "failed")) ? i->inactive_enter_timestamp : + streq_ptr(i->active_state, "activating") ? i->inactive_exit_timestamp : + i->active_exit_timestamp; + + s1 = format_timestamp_pretty(since1, sizeof(since1), timestamp); + s2 = format_timestamp(since2, sizeof(since2), timestamp); + + if (s1) + printf(" since [%s; %s]\n", s2, s1); + else if (s2) + printf(" since [%s]\n", s2); + else + printf("\n"); + if (i->sysfs_path) printf("\t Device: %s\n", i->sysfs_path); else if (i->where) @@ -1519,12 +1636,18 @@ static void print_status_info(UnitStatusInfo *i) { continue; t = strv_join(p->argv, " "); - printf("\t Exited: %u (%s, code=%s, ", p->pid, strna(t), sigchld_code_to_string(p->code)); + printf("\t Process: %u (%s, code=%s, ", p->pid, strna(t), sigchld_code_to_string(p->code)); free(t); - if (p->code == CLD_EXITED) + if (p->code == CLD_EXITED) { + const char *c; + printf("status=%i", p->status); - else + + if ((c = exit_status_to_string(p->status, i->is_sysv ? EXIT_STATUS_LSB : EXIT_STATUS_SYSTEMD))) + printf("/%s", c); + + } else printf("signal=%s", signal_to_string(p->status)); printf(")\n"); @@ -1542,7 +1665,7 @@ static void print_status_info(UnitStatusInfo *i) { printf("\t"); if (i->main_pid > 0) { - printf(" Main: %u", (unsigned) i->main_pid); + printf("Main PID: %u", (unsigned) i->main_pid); if (i->running) { char *t = NULL; @@ -1554,9 +1677,15 @@ static void print_status_info(UnitStatusInfo *i) { } else if (i->exit_code > 0) { printf(" (code=%s, ", sigchld_code_to_string(i->exit_code)); - if (i->exit_code == CLD_EXITED) + if (i->exit_code == CLD_EXITED) { + const char *c; + printf("status=%i", i->exit_status); - else + + if ((c = exit_status_to_string(i->exit_status, i->is_sysv ? EXIT_STATUS_LSB : EXIT_STATUS_SYSTEMD))) + printf("/%s", c); + + } else printf("signal=%s", signal_to_string(i->exit_status)); printf(")"); } @@ -1625,9 +1754,10 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn i->description = s; else if (streq(name, "FragmentPath")) i->path = s; - else if (streq(name, "SysVPath")) + else if (streq(name, "SysVPath")) { + i->is_sysv = true; i->path = s; - else if (streq(name, "DefaultControlGroup")) + } else if (streq(name, "DefaultControlGroup")) i->default_control_group = s; else if (streq(name, "StatusText")) i->status_text = s; @@ -1700,6 +1830,14 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn i->start_timestamp = (usec_t) u; else if (streq(name, "ExecMainExitTimestamp")) i->exit_timestamp = (usec_t) u; + else if (streq(name, "ActiveEnterTimestamp")) + i->active_enter_timestamp = (usec_t) u; + else if (streq(name, "InactiveEnterTimestamp")) + i->inactive_enter_timestamp = (usec_t) u; + else if (streq(name, "InactiveExitTimestamp")) + i->inactive_exit_timestamp = (usec_t) u; + else if (streq(name, "ActiveExitTimestamp")) + i->active_exit_timestamp = (usec_t) u; break; } @@ -2014,7 +2152,7 @@ static int show_one(DBusConnection *bus, const char *path, bool show_properties, } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2073,16 +2211,27 @@ static int show_one(DBusConnection *bus, const char *path, bool show_properties, dbus_message_iter_next(&sub); } - if (!show_properties) - print_status_info(&info); + r = 0; + + if (!show_properties) { + if (arg_sysv_compat && + !streq_ptr(info.active_state, "active") && + !streq_ptr(info.active_state, "reloading")) { + + /* If the SysV compatibility mode is on, we + * will refuse to run "status" on units that + * aren't active */ + log_error("Unit not active."); + r = -EADDRNOTAVAIL; + } else + print_status_info(&info); + } while ((p = info.exec)) { LIST_REMOVE(ExecStatusInfo, exec, info.exec, p); exec_status_info_free(p); } - r = 0; - finish: if (m) dbus_message_unref(m); @@ -2146,7 +2295,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { if (!dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2173,7 +2322,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2202,7 +2351,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2229,7 +2378,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2238,7 +2387,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2291,7 +2440,7 @@ static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage DBUS_TYPE_STRING, &id, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) - log_error("Failed to parse message: %s", error.message); + log_error("Failed to parse message: %s", bus_error_message(&error)); else if (streq(dbus_message_get_member(message), "UnitNew")) printf("Unit %s added.\n", id); else @@ -2306,21 +2455,30 @@ static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage DBUS_TYPE_UINT32, &id, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) - log_error("Failed to parse message: %s", error.message); + log_error("Failed to parse message: %s", bus_error_message(&error)); else if (streq(dbus_message_get_member(message), "JobNew")) printf("Job %u added.\n", id); else printf("Job %u removed.\n", id); - } else if (dbus_message_is_signal(message, "org.freedesktop.systemd1.Unit", "Changed") || - dbus_message_is_signal(message, "org.freedesktop.systemd1.Job", "Changed")) { + } else if (dbus_message_is_signal(message, "org.freedesktop.DBus.Properties", "PropertiesChanged")) { const char *path, *interface, *property = "Id"; DBusMessageIter iter, sub; path = dbus_message_get_path(message); - interface = dbus_message_get_interface(message); + + if (!dbus_message_get_args(message, &error, + DBUS_TYPE_STRING, &interface, + DBUS_TYPE_INVALID)) { + log_error("Failed to parse message: %s", bus_error_message(&error)); + goto finish; + } + + if (!streq(interface, "org.freedesktop.systemd1.Job") && + !streq(interface, "org.freedesktop.systemd1.Unit")) + goto finish; if (!(m = dbus_message_new_method_call( "org.freedesktop.systemd1", @@ -2340,7 +2498,7 @@ static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage } if (!(reply = dbus_connection_send_with_reply_and_block(connection, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); goto finish; } @@ -2412,20 +2570,7 @@ static int monitor(DBusConnection *bus, char **args, unsigned n) { &error); if (dbus_error_is_set(&error)) { - log_error("Failed to add match: %s", error.message); - r = -EIO; - goto finish; - } - - dbus_bus_add_match(bus, - "type='signal'," - "sender='org.freedesktop.systemd1'," - "interface='org.freedesktop.systemd1.Unit'," - "member='Changed'", - &error); - - if (dbus_error_is_set(&error)) { - log_error("Failed to add match: %s", error.message); + log_error("Failed to add match: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2433,12 +2578,12 @@ static int monitor(DBusConnection *bus, char **args, unsigned n) { dbus_bus_add_match(bus, "type='signal'," "sender='org.freedesktop.systemd1'," - "interface='org.freedesktop.systemd1.Job'," - "member='Changed'", + "interface='org.freedesktop.DBus.Properties'," + "member='PropertiesChanged'", &error); if (dbus_error_is_set(&error)) { - log_error("Failed to add match: %s", error.message); + log_error("Failed to add match: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2461,7 +2606,7 @@ static int monitor(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2504,7 +2649,7 @@ static int dump(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2512,7 +2657,7 @@ static int dump(DBusConnection *bus, char **args, unsigned n) { if (!dbus_message_get_args(reply, &error, DBUS_TYPE_STRING, &text, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2568,7 +2713,7 @@ static int snapshot(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2576,7 +2721,7 @@ static int snapshot(DBusConnection *bus, char **args, unsigned n) { if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2602,7 +2747,7 @@ static int snapshot(DBusConnection *bus, char **args, unsigned n) { dbus_message_unref(reply); if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2673,7 +2818,7 @@ static int delete_snapshot(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2681,7 +2826,7 @@ static int delete_snapshot(DBusConnection *bus, char **args, unsigned n) { if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", error.message); + log_error("Failed to parse reply: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2699,7 +2844,7 @@ static int delete_snapshot(DBusConnection *bus, char **args, unsigned n) { dbus_message_unref(reply); if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2742,7 +2887,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { streq(args[0], "clear-jobs") || streq(args[0], "cancel") ? "ClearJobs" : streq(args[0], "daemon-reexec") ? "Reexecute" : - streq(args[0], "reset-maintenance") ? "ResetMaintenance" : + streq(args[0], "reset-failed") ? "ResetFailed" : streq(args[0], "daemon-exit") ? "Exit" : "Reload"; } @@ -2765,7 +2910,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { goto finish; } - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2784,7 +2929,7 @@ finish: return r; } -static int reset_maintenance(DBusConnection *bus, char **args, unsigned n) { +static int reset_failed(DBusConnection *bus, char **args, unsigned n) { DBusMessage *m = NULL, *reply = NULL; unsigned i; int r; @@ -2802,7 +2947,7 @@ static int reset_maintenance(DBusConnection *bus, char **args, unsigned n) { "org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", - "ResetMaintenanceUnit"))) { + "ResetFailedUnit"))) { log_error("Could not allocate message."); r = -ENOMEM; goto finish; @@ -2817,7 +2962,7 @@ static int reset_maintenance(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2871,7 +3016,7 @@ static int show_enviroment(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -2969,7 +3114,7 @@ static int set_environment(DBusConnection *bus, char **args, unsigned n) { } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -3709,11 +3854,11 @@ static int systemctl_help(void) { " otherwise restart if active\n" " isolate [NAME] Start one unit and stop all others\n" " is-active [NAME...] Check whether units are active\n" - " status [NAME...] Show runtime status of one or more units\n" + " status [NAME...|PID...] Show runtime status of one or more units\n" " show [NAME...|JOB...] Show properties of one or more\n" " units/jobs or the manager\n" - " reset-maintenance [NAME...] Reset maintenance state for all, one,\n" - " or more units\n" + " reset-failed [NAME...] Reset failed state for all, one, or more\n" + " units\n" " enable [NAME...] Enable one or more unit files\n" " disable [NAME...] Disable one or more unit files\n" " is-enabled [NAME...] Check whether unit files are enabled\n" @@ -3765,7 +3910,7 @@ static int halt_help(void) { static int shutdown_help(void) { - printf("%s [OPTIONS...] [now] [WALL...]\n\n" + printf("%s [OPTIONS...] [TIME] [WALL...]\n\n" "Shut down the system.\n\n" " --help Show this help\n" " -H --halt Halt the machine\n" @@ -3773,7 +3918,8 @@ static int shutdown_help(void) { " -r --reboot Reboot the machine\n" " -h Equivalent to --poweroff, overriden by --halt\n" " -k Don't halt/power-off/reboot, just send warnings\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n", + " --no-wall Don't send wall message before halt/power-off/reboot\n" + " -c Cancel a pending shutdown\n", program_invocation_short_name); return 0; @@ -3821,7 +3967,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_FULL, ARG_FORCE, ARG_NO_RELOAD, - ARG_DEFAULTS + ARG_DEFAULTS, + ARG_SYSV_COMPAT }; static const struct option options[] = { @@ -3841,7 +3988,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "require", no_argument, NULL, ARG_REQUIRE }, { "force", no_argument, NULL, ARG_FORCE }, { "no-reload", no_argument, NULL, ARG_NO_RELOAD }, - { "defaults", no_argument, NULL, ARG_DEFAULTS }, + { "defaults", no_argument, NULL, ARG_DEFAULTS }, + { "sysv-compat", no_argument, NULL, ARG_SYSV_COMPAT }, { NULL, 0, NULL, 0 } }; @@ -3935,6 +4083,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_defaults = true; break; + case ARG_SYSV_COMPAT: + arg_sysv_compat = true; + break; + case '?': return -EINVAL; @@ -4040,6 +4192,56 @@ static int halt_parse_argv(int argc, char *argv[]) { return 1; } +static int parse_time_spec(const char *t, usec_t *_u) { + assert(t); + assert(_u); + + if (streq(t, "now")) + *_u = 0; + else if (t[0] == '+') { + uint64_t u; + + if (safe_atou64(t + 1, &u) < 0) + return -EINVAL; + + *_u = now(CLOCK_REALTIME) + USEC_PER_MINUTE * u; + } else { + char *e = NULL; + long hour, minute; + struct tm tm; + time_t s; + usec_t n; + + errno = 0; + hour = strtol(t, &e, 10); + if (errno != 0 || *e != ':' || hour < 0 || hour > 23) + return -EINVAL; + + minute = strtol(e+1, &e, 10); + if (errno != 0 || *e != 0 || minute < 0 || minute > 59) + return -EINVAL; + + n = now(CLOCK_REALTIME); + s = (time_t) (n / USEC_PER_SEC); + + zero(tm); + assert_se(localtime_r(&s, &tm)); + + tm.tm_hour = (int) hour; + tm.tm_min = (int) minute; + tm.tm_sec = 0; + + assert_se(s = mktime(&tm)); + + *_u = (usec_t) s * USEC_PER_SEC; + + while (*_u <= n) + *_u += USEC_PER_DAY; + } + + return 0; +} + static int shutdown_parse_argv(int argc, char *argv[]) { enum { @@ -4056,12 +4258,12 @@ static int shutdown_parse_argv(int argc, char *argv[]) { { NULL, 0, NULL, 0 } }; - int c; + int c, r; assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "HPrhkt:a", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "HPrhkt:afFc", options, NULL)) >= 0) { switch (c) { case ARG_HELP: @@ -4098,6 +4300,10 @@ static int shutdown_parse_argv(int argc, char *argv[]) { /* Compatibility nops */ break; + case 'c': + arg_action = ACTION_CANCEL_SHUTDOWN; + break; + case '?': return -EINVAL; @@ -4107,10 +4313,15 @@ static int shutdown_parse_argv(int argc, char *argv[]) { } } - if (argc > optind && !streq(argv[optind], "now")) - log_warning("First argument '%s' isn't 'now'. Ignoring.", argv[optind]); + if (argc > optind) { + if ((r = parse_time_spec(argv[optind], &arg_when)) < 0) { + log_error("Failed to parse time specification: %s", argv[optind]); + return r; + } + } else + arg_when = now(CLOCK_REALTIME) + USEC_PER_MINUTE; - /* We ignore the time argument */ + /* We skip the time argument */ if (argc > optind + 1) arg_wall = argv + optind + 1; @@ -4338,7 +4549,7 @@ static int talk_upstart(void) { goto finish; } - log_error("Failed to connect to Upstart bus: %s", error.message); + log_error("Failed to connect to Upstart bus: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -4382,7 +4593,7 @@ static int talk_upstart(void) { goto finish; } - log_error("Failed to issue method call: %s", error.message); + log_error("Failed to issue method call: %s", bus_error_message(&error)); r = -EIO; goto finish; } @@ -4489,7 +4700,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError { "default", EQUAL, 1, start_special }, { "rescue", EQUAL, 1, start_special }, { "emergency", EQUAL, 1, start_special }, - { "reset-maintenance", MORE, 1, reset_maintenance }, + { "reset-failed", MORE, 1, reset_failed }, { "enable", MORE, 2, enable_unit }, { "disable", MORE, 2, enable_unit }, { "is-enabled", MORE, 2, enable_unit } @@ -4565,6 +4776,66 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError return verbs[i].dispatch(bus, argv + optind, left); } +static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) { + int fd = -1; + struct msghdr msghdr; + struct iovec iovec; + union sockaddr_union sockaddr; + struct ucred *ucred; + union { + struct cmsghdr cmsghdr; + uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; + } control; + struct shutdownd_command c; + + zero(c); + c.elapse = t; + c.mode = mode; + c.warn_wall = warn; + + if (message) + strncpy(c.wall_message, message, sizeof(c.wall_message)); + + if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) + return -errno; + + zero(sockaddr); + sockaddr.sa.sa_family = AF_UNIX; + sockaddr.un.sun_path[0] = 0; + strncpy(sockaddr.un.sun_path+1, "/org/freedesktop/systemd1/shutdownd", sizeof(sockaddr.un.sun_path)-1); + + zero(iovec); + iovec.iov_base = (char*) &c; + iovec.iov_len = sizeof(c); + + zero(control); + control.cmsghdr.cmsg_level = SOL_SOCKET; + control.cmsghdr.cmsg_type = SCM_CREDENTIALS; + control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); + + ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); + ucred->pid = getpid(); + ucred->uid = getuid(); + ucred->gid = getgid(); + + zero(msghdr); + msghdr.msg_name = &sockaddr; + msghdr.msg_namelen = sizeof(sa_family_t) + 1 + sizeof("/org/freedesktop/systemd1/shutdownd") - 1; + + msghdr.msg_iov = &iovec; + msghdr.msg_iovlen = 1; + msghdr.msg_control = &control; + msghdr.msg_controllen = control.cmsghdr.cmsg_len; + + if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { + close_nointr_nofail(fd); + return -errno; + } + + close_nointr_nofail(fd); + return 0; +} + static int reload_with_fallback(DBusConnection *bus) { if (bus) { @@ -4599,7 +4870,7 @@ static int start_with_fallback(DBusConnection *bus) { /* Nothing else worked, so let's try * /dev/initctl */ - if (talk_initctl() != 0) + if (talk_initctl() > 0) goto done; log_error("Failed to talk to init daemon."); @@ -4614,16 +4885,41 @@ static int halt_main(DBusConnection *bus) { int r; if (geteuid() != 0) { - log_error("Must to be root."); + log_error("Must be root."); return -EPERM; } + if (arg_when > 0) { + char *m; + char date[FORMAT_TIMESTAMP_MAX]; + + m = strv_join(arg_wall, " "); + r = send_shutdownd(arg_when, + arg_action == ACTION_HALT ? 'H' : + arg_action == ACTION_POWEROFF ? 'P' : + 'r', + !arg_no_wall, + m); + free(m); + + if (r < 0) + log_warning("Failed to talk to shutdownd, proceeding with immediate shutdown: %s", strerror(-r)); + else { + log_info("Shutdown scheduled for %s, use 'shutdown -c' to cancel.", + format_timestamp(date, sizeof(date), arg_when)); + return 0; + } + } + if (!arg_dry && !arg_immediate) return start_with_fallback(bus); - if (!arg_no_wtmp) - if ((r = utmp_put_shutdown(0)) < 0) + if (!arg_no_wtmp) { + if (sd_booted() > 0) + log_debug("Not writing utmp record, assuming that systemd-update-utmp is used."); + else if ((r = utmp_put_shutdown(0)) < 0) log_warning("Failed to write utmp record: %s", strerror(-r)); + } if (!arg_no_sync) sync(); @@ -4683,6 +4979,7 @@ int main(int argc, char*argv[]) { dbus_error_init(&error); log_parse_environment(); + log_open(); if ((r = parse_argv(argc, argv)) < 0) goto finish; @@ -4728,6 +5025,10 @@ int main(int argc, char*argv[]) { retval = reload_with_fallback(bus) < 0; break; + case ACTION_CANCEL_SHUTDOWN: + retval = send_shutdownd(0, 0, false, NULL) < 0; + break; + case ACTION_INVALID: case ACTION_RUNLEVEL: default: