X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemctl.c;h=de41db79e2eb4e5bcd9bef7733fae1bae2476f04;hb=f73e33d9ecdd5f97f31a3efcca254519eef5b7ea;hp=50473a182af57df4a6238c465a5311e6bd4d9e41;hpb=2396fb04f78eaa9842c747e384218f0069446960;p=elogind.git diff --git a/src/systemctl.c b/src/systemctl.c index 50473a182..de41db79e 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -50,6 +50,7 @@ #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; @@ -68,10 +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 bool arg_skip_fsck = false; -static bool arg_force_fsck = false; static enum action { ACTION_INVALID, ACTION_SYSTEMCTL, @@ -126,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)) @@ -245,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; } @@ -309,8 +312,12 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { qsort(unit_infos, c, sizeof(struct unit_info), compare_unit_info); - if (isatty(STDOUT_FILENO)) - printf("%-45s %-6s %-12s %-12s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION"); + 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; @@ -321,30 +328,47 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { (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(u->load_state, "loaded")) { + on_loaded = ansi_highlight(true); + off_loaded = ansi_highlight(false); + } else + on_loaded = off_loaded = ""; - if (streq(u->active_state, "maintenance")) { - on = ansi_highlight(true); - off = ansi_highlight(false); + if (streq(u->active_state, "failed")) { + on_active = ansi_highlight(true); + off_active = ansi_highlight(false); } else - on = off = ""; + 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(u->id, 45, 33); - printf("%-45s %-6s %s%-12s %-12s%s%n", e ? e : u->id, u->load_state, on, u->active_state, u->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 (u->job_id != 0) - printf(" => %-12s%n", u->job_type, &b); + printf(" %-15s%n", u->job_type, &b); else b = 1 + 15; - if (a + b + 2 < columns()) { + if (a + b + 1 < columns()) { if (u->job_id == 0) printf(" "); - printf(" %.*s", columns() - a - b - 2, u->description); + if (arg_full) + printf(" %s", u->description); + else + printf(" %.*s", columns() - a - b - 1, u->description); } fputs("\n", stdout); @@ -353,10 +377,10 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { 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", c); @@ -469,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; } @@ -552,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; } @@ -645,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; } @@ -660,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; @@ -686,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++; @@ -695,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: @@ -742,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; } @@ -810,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; } @@ -818,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; } @@ -836,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; } @@ -965,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; @@ -999,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; } @@ -1088,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; } @@ -1096,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; } @@ -1308,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; } @@ -1335,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; } @@ -1360,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); @@ -1485,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; @@ -1518,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); @@ -1544,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")) { @@ -1554,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) @@ -1583,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"); @@ -1606,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; @@ -1618,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(")"); } @@ -1689,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; @@ -1764,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; } @@ -2078,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; } @@ -2137,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); @@ -2210,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; } @@ -2237,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; } @@ -2266,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; } @@ -2293,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; } @@ -2302,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; } @@ -2355,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 @@ -2370,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", @@ -2404,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; } @@ -2476,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; } @@ -2497,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; } @@ -2525,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; } @@ -2568,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; } @@ -2576,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; } @@ -2632,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; } @@ -2640,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; } @@ -2666,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; } @@ -2737,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; } @@ -2745,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; } @@ -2763,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; } @@ -2806,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"; } @@ -2829,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; } @@ -2848,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; @@ -2866,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; @@ -2881,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; } @@ -2935,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; } @@ -3033,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; } @@ -3776,8 +3857,8 @@ static int systemctl_help(void) { " 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" @@ -3829,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" @@ -3838,8 +3919,6 @@ static int shutdown_help(void) { " -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" - " -f Skip fsck on reboot\n" - " -F Force fsck on reboot\n" " -c Cancel a pending shutdown\n", program_invocation_short_name); @@ -3888,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[] = { @@ -3908,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 } }; @@ -4002,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; @@ -4137,11 +4222,14 @@ static int parse_time_spec(const char *t, usec_t *_u) { return -EINVAL; n = now(CLOCK_REALTIME); - s = (time_t) n / USEC_PER_SEC; + 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)); @@ -4212,14 +4300,6 @@ static int shutdown_parse_argv(int argc, char *argv[]) { /* Compatibility nops */ break; - case 'f': - arg_skip_fsck = true; - break; - - case 'F': - arg_force_fsck = true; - break; - case 'c': arg_action = ACTION_CANCEL_SHUTDOWN; break; @@ -4239,7 +4319,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) { return r; } } else - arg_when = USEC_PER_MINUTE; + arg_when = now(CLOCK_REALTIME) + USEC_PER_MINUTE; /* We skip the time argument */ if (argc > optind + 1) @@ -4469,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; } @@ -4513,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; } @@ -4620,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 } @@ -4805,20 +4885,13 @@ 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_force_fsck) { - if ((r = touch("/forcefsck")) < 0) - log_warning("Failed to create /forcefsck: %s", strerror(-r)); - } else if (arg_skip_fsck) { - if ((r = touch("/fastboot")) < 0) - log_warning("Failed to create /fastboot: %s", strerror(-r)); - } - if (arg_when > 0) { char *m; + char date[FORMAT_TIMESTAMP_MAX]; m = strv_join(arg_wall, " "); r = send_shutdownd(arg_when, @@ -4831,8 +4904,11 @@ static int halt_main(DBusConnection *bus) { if (r < 0) log_warning("Failed to talk to shutdownd, proceeding with immediate shutdown: %s", strerror(-r)); - else + 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)