X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl.c;h=555c171b0e4831a0bca47be23c482645fe360292;hp=eb7178e2dc4cc4e5da064583116e057e7e3eca44;hb=b4f27ccc6339dff34f0293b91b2047027a211809;hpb=cc8a7a6129145dc485c82549edd39bcb9b52fd45 diff --git a/src/systemctl.c b/src/systemctl.c index eb7178e2d..555c171b0 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -51,6 +52,9 @@ #include "sd-daemon.h" #include "shutdownd.h" #include "exit-status.h" +#include "bus-errors.h" +#include "build.h" +#include "unit-name.h" static const char *arg_type = NULL; static char **arg_property = NULL; @@ -69,11 +73,6 @@ 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 { @@ -82,6 +81,8 @@ static enum action { ACTION_HALT, ACTION_POWEROFF, ACTION_REBOOT, + ACTION_KEXEC, + ACTION_EXIT, ACTION_RUNLEVEL2, ACTION_RUNLEVEL3, ACTION_RUNLEVEL4, @@ -130,8 +131,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)) @@ -146,6 +146,34 @@ static bool error_is_no_service(DBusError *error) { return startswith(error->name, "org.freedesktop.DBus.Error.Spawn."); } +static int translate_bus_error_to_exit_status(int r, const DBusError *error) { + assert(error); + + if (!dbus_error_is_set(error)) + return r; + + if (dbus_error_has_name(error, DBUS_ERROR_ACCESS_DENIED) || + dbus_error_has_name(error, BUS_ERROR_ONLY_BY_DEPENDENCY) || + dbus_error_has_name(error, BUS_ERROR_NO_ISOLATION) || + dbus_error_has_name(error, BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE)) + return EXIT_NOPERMISSION; + + if (dbus_error_has_name(error, BUS_ERROR_NO_SUCH_UNIT)) + return EXIT_NOTINSTALLED; + + if (dbus_error_has_name(error, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE) || + dbus_error_has_name(error, BUS_ERROR_NOT_SUPPORTED)) + return EXIT_NOTIMPLEMENTED; + + if (dbus_error_has_name(error, BUS_ERROR_LOAD_FAILED)) + return EXIT_NOTCONFIGURED; + + if (r != 0) + return r; + + return EXIT_FAILURE; +} + static int bus_iter_get_basic_and_next(DBusMessageIter *iter, int type, void *data, bool next) { assert(iter); @@ -167,6 +195,7 @@ static void warn_wall(enum action action) { [ACTION_HALT] = "The system is going down for system halt NOW!", [ACTION_REBOOT] = "The system is going down for reboot NOW!", [ACTION_POWEROFF] = "The system is going down for power-off NOW!", + [ACTION_KEXEC] = "The system is going down for kexec reboot NOW!", [ACTION_RESCUE] = "The system is going down to rescue mode NOW!", [ACTION_EMERGENCY] = "The system is going down to emergency mode NOW!" }; @@ -227,12 +256,114 @@ static int compare_unit_info(const void *a, const void *b) { return strcasecmp(u->id, v->id); } +static bool output_show_job(const struct unit_info *u) { + const char *dot; + + return (!arg_type || ((dot = strrchr(u->id, '.')) && + streq(dot+1, arg_type))) && + (arg_all || !(streq(u->active_state, "inactive") || u->following[0]) || u->job_id > 0); +} + +static void output_units_list(const struct unit_info *unit_infos, unsigned c) { + unsigned active_len, sub_len, job_len; + const struct unit_info *u; + + active_len = sizeof("ACTIVE")-1; + sub_len = sizeof("SUB")-1; + job_len = sizeof("JOB")-1; + + for (u = unit_infos; u < unit_infos + c; u++) { + if (!output_show_job(u)) + continue; + + active_len = MAX(active_len, strlen(u->active_state)); + sub_len = MAX(sub_len, strlen(u->sub_state)); + if (u->job_id != 0) + job_len = MAX(job_len, strlen(u->job_type)); + } + + if (on_tty()) { + printf("%-25s %-6s %-*s %-*s %-*s", "UNIT", "LOAD", + active_len, "ACTIVE", sub_len, "SUB", job_len, "JOB"); + if (columns() >= 80+12 || arg_full) + printf(" %s\n", "DESCRIPTION"); + else + printf("\n"); + } + + for (u = unit_infos; u < unit_infos + c; u++) { + char *e; + int a = 0, b = 0; + const char *on_loaded, *off_loaded; + const char *on_active, *off_active; + + if (!output_show_job(u)) + continue; + + if (!streq(u->load_state, "loaded") && + !streq(u->load_state, "banned")) { + on_loaded = ansi_highlight(true); + off_loaded = ansi_highlight(false); + } else + 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%-*s %-*s%s%n", + e ? e : u->id, + on_loaded, u->load_state, off_loaded, + on_active, active_len, u->active_state, + sub_len, u->sub_state, off_active, + &a); + + free(e); + + a -= strlen(on_loaded) + strlen(off_loaded); + a -= strlen(on_active) + strlen(off_active); + + if (u->job_id != 0) + printf(" %-*s", job_len, u->job_type); + else + b = 1 + job_len; + + if (a + b + 1 < columns()) { + if (u->job_id == 0) + printf(" %-*s", job_len, ""); + + if (arg_full) + printf(" %s", u->description); + else + printf(" %.*s", columns() - a - b - 1, u->description); + } + + fputs("\n", stdout); + } + + if (on_tty()) { + 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); + else + printf("\n%u units listed. Pass --all to see inactive units, too.\n", c); + } +} + static int list_units(DBusConnection *bus, char **args, unsigned n) { DBusMessage *m = NULL, *reply = NULL; DBusError error; int r; DBusMessageIter iter, sub, sub2; - unsigned c = 0, k, n_units = 0; + unsigned c = 0, n_units = 0; struct unit_info *unit_infos = NULL; dbus_error_init(&error); @@ -312,61 +443,7 @@ 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"); - - 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(u->active_state, "inactive") || u->following[0]) || u->job_id > 0)) { - char *e; - int a = 0, b = 0; - const char *on, *off; - - if (streq(u->active_state, "maintenance")) { - on = ansi_highlight(true); - off = ansi_highlight(false); - } else - on = off = ""; - - 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); - - if (u->job_id != 0) - printf(" => %-12s%n", u->job_type, &b); - else - b = 1 + 15; - - if (a + b + 2 < columns()) { - if (u->job_id == 0) - printf(" "); - - printf(" %.*s", columns() - a - b - 2, u->description); - } - - fputs("\n", stdout); - } - } - - if (isatty(STDOUT_FILENO)) { - - 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); - else - printf("\n%u units listed. Pass --all to see inactive units, too.\n", c); - } + output_units_list(unit_infos, c); r = 0; @@ -664,7 +741,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; @@ -690,8 +768,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++; @@ -699,7 +777,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: @@ -1034,7 +1114,7 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) { ; if (!arg_quiet && d.failed) - log_error("Job failed, see logs for details."); + log_error("Job failed, see system logs for details."); r = d.failed ? -EIO : 0; @@ -1049,10 +1129,10 @@ static int start_unit_one( const char *method, const char *name, const char *mode, + DBusError *error, Set *s) { DBusMessage *m = NULL, *reply = NULL; - DBusError error; const char *path; int r; @@ -1060,10 +1140,9 @@ static int start_unit_one( assert(method); assert(name); assert(mode); + assert(error); assert(arg_no_block || s); - dbus_error_init(&error); - if (!(m = dbus_message_new_method_call( "org.freedesktop.systemd1", "/org/freedesktop/systemd1", @@ -1083,24 +1162,24 @@ static int start_unit_one( goto finish; } - if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { + if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, error))) { - if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(&error)) { + if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(error)) { /* There's always a fallback possible for * legacy actions. */ - r = 0; + r = -EADDRNOTAVAIL; goto finish; } - log_error("Failed to issue method call: %s", bus_error_message(&error)); + log_error("Failed to issue method call: %s", bus_error_message(error)); r = -EIO; goto finish; } - if (!dbus_message_get_args(reply, &error, + if (!dbus_message_get_args(reply, error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { - log_error("Failed to parse reply: %s", bus_error_message(&error)); + log_error("Failed to parse reply: %s", bus_error_message(error)); r = -EIO; goto finish; } @@ -1125,7 +1204,7 @@ static int start_unit_one( } } - r = 1; + r = 0; finish: if (m) @@ -1134,8 +1213,6 @@ finish: if (reply) dbus_message_unref(reply); - dbus_error_free(&error); - return r; } @@ -1146,12 +1223,16 @@ static enum action verb_to_action(const char *verb) { return ACTION_POWEROFF; else if (streq(verb, "reboot")) return ACTION_REBOOT; + else if (streq(verb, "kexec")) + return ACTION_KEXEC; else if (streq(verb, "rescue")) return ACTION_RESCUE; else if (streq(verb, "emergency")) return ACTION_EMERGENCY; else if (streq(verb, "default")) return ACTION_DEFAULT; + else if (streq(verb, "exit")) + return ACTION_EXIT; else return ACTION_INVALID; } @@ -1162,19 +1243,24 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { [ACTION_HALT] = SPECIAL_HALT_TARGET, [ACTION_POWEROFF] = SPECIAL_POWEROFF_TARGET, [ACTION_REBOOT] = SPECIAL_REBOOT_TARGET, + [ACTION_KEXEC] = SPECIAL_KEXEC_TARGET, [ACTION_RUNLEVEL2] = SPECIAL_RUNLEVEL2_TARGET, [ACTION_RUNLEVEL3] = SPECIAL_RUNLEVEL3_TARGET, [ACTION_RUNLEVEL4] = SPECIAL_RUNLEVEL4_TARGET, [ACTION_RUNLEVEL5] = SPECIAL_RUNLEVEL5_TARGET, [ACTION_RESCUE] = SPECIAL_RESCUE_TARGET, [ACTION_EMERGENCY] = SPECIAL_EMERGENCY_TARGET, - [ACTION_DEFAULT] = SPECIAL_DEFAULT_TARGET + [ACTION_DEFAULT] = SPECIAL_DEFAULT_TARGET, + [ACTION_EXIT] = SPECIAL_EXIT_TARGET }; - int r; + int r, ret = 0; unsigned i; const char *method, *mode, *one_name; Set *s = NULL; + DBusError error; + + dbus_error_init(&error); assert(bus); @@ -1183,11 +1269,11 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { streq(args[0], "stop") ? "StopUnit" : streq(args[0], "reload") ? "ReloadUnit" : streq(args[0], "restart") ? "RestartUnit" : - streq(args[0], "try-restart") ? "TryRestartUnit" : + streq(args[0], "try-restart") || + streq(args[0], "condrestart") ? "TryRestartUnit" : streq(args[0], "reload-or-restart") ? "ReloadOrRestartUnit" : streq(args[0], "reload-or-try-restart") || - streq(args[0], "force-reload") || - streq(args[0], "condrestart") ? "ReloadOrTryRestartUnit" : + streq(args[0], "force-reload") ? "ReloadOrTryRestartUnit" : "StartUnit"; mode = @@ -1206,46 +1292,52 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { method = "StartUnit"; mode = (arg_action == ACTION_EMERGENCY || - arg_action == ACTION_RESCUE) ? "isolate" : "replace"; + arg_action == ACTION_RESCUE || + arg_action == ACTION_RUNLEVEL2 || + arg_action == ACTION_RUNLEVEL3 || + arg_action == ACTION_RUNLEVEL4 || + arg_action == ACTION_RUNLEVEL5) ? "isolate" : "replace"; one_name = table[arg_action]; } if (!arg_no_block) { - if ((r = enable_wait_for_jobs(bus)) < 0) { - log_error("Could not watch jobs: %s", strerror(-r)); + if ((ret = enable_wait_for_jobs(bus)) < 0) { + log_error("Could not watch jobs: %s", strerror(-ret)); goto finish; } if (!(s = set_new(string_hash_func, string_compare_func))) { log_error("Failed to allocate set."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } } - r = 0; - if (one_name) { - if ((r = start_unit_one(bus, method, one_name, mode, s)) <= 0) + if ((ret = start_unit_one(bus, method, one_name, mode, &error, s)) <= 0) goto finish; } else { for (i = 1; i < n; i++) - if ((r = start_unit_one(bus, method, args[i], mode, s)) < 0) - goto finish; + if ((r = start_unit_one(bus, method, args[i], mode, &error, s)) != 0) { + ret = translate_bus_error_to_exit_status(r, &error); + dbus_error_free(&error); + } } if (!arg_no_block) - if ((r = wait_for_jobs(bus, s)) < 0) + if ((r = wait_for_jobs(bus, s)) < 0) { + ret = r; goto finish; - - r = 1; + } finish: if (s) set_free_free(s); - return r; + dbus_error_free(&error); + + return ret; } static int start_special(DBusConnection *bus, char **args, unsigned n) { @@ -1254,6 +1346,14 @@ static int start_special(DBusConnection *bus, char **args, unsigned n) { assert(bus); assert(args); + if (arg_force && + (streq(args[0], "halt") || + streq(args[0], "poweroff") || + streq(args[0], "reboot") || + streq(args[0], "kexec") || + streq(args[0], "exit"))) + return daemon_reload(bus, args, n); + r = start_unit(bus, args, n); if (r >= 0) @@ -1267,7 +1367,7 @@ static int check_unit(DBusConnection *bus, char **args, unsigned n) { const char *interface = "org.freedesktop.systemd1.Unit", *property = "ActiveState"; - int r = -EADDRNOTAVAIL; + int r = 3; /* According to LSB: "program is not running" */ DBusError error; unsigned i; @@ -1485,6 +1585,7 @@ typedef struct UnitStatusInfo { const char *sub_state; const char *description; + const char *following; const char *path; const char *default_control_group; @@ -1501,7 +1602,9 @@ typedef struct UnitStatusInfo { pid_t control_pid; const char *status_text; bool running:1; +#ifdef HAVE_SYSV_COMPAT bool is_sysv:1; +#endif usec_t start_timestamp; usec_t exit_timestamp; @@ -1544,7 +1647,11 @@ static void print_status_info(UnitStatusInfo *i) { printf("\n"); - if (streq_ptr(i->load_state, "failed")) { + if (i->following) + printf("\t Follow: unit currently follows state of %s\n", i->following); + + if (streq_ptr(i->load_state, "failed") || + streq_ptr(i->load_state, "banned")) { on = ansi_highlight(true); off = ansi_highlight(false); } else @@ -1557,7 +1664,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")) { @@ -1581,7 +1688,7 @@ static void print_status_info(UnitStatusInfo *i) { 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, "maintenance")) ? i->inactive_enter_timestamp : + streq_ptr(i->active_state, "failed")) ? i->inactive_enter_timestamp : streq_ptr(i->active_state, "activating") ? i->inactive_exit_timestamp : i->active_exit_timestamp; @@ -1589,9 +1696,9 @@ static void print_status_info(UnitStatusInfo *i) { s2 = format_timestamp(since2, sizeof(since2), timestamp); if (s1) - printf(" since [%s; %s]\n", s2, s1); + printf(" since %s; %s\n", s2, s1); else if (s2) - printf(" since [%s]\n", s2); + printf(" since %s\n", s2); else printf("\n"); @@ -1621,7 +1728,11 @@ static void print_status_info(UnitStatusInfo *i) { printf("status=%i", p->status); +#ifdef HAVE_SYSV_COMPAT if ((c = exit_status_to_string(p->status, i->is_sysv ? EXIT_STATUS_LSB : EXIT_STATUS_SYSTEMD))) +#else + if ((c = exit_status_to_string(p->status, EXIT_STATUS_SYSTEMD))) +#endif printf("/%s", c); } else @@ -1659,7 +1770,11 @@ static void print_status_info(UnitStatusInfo *i) { printf("status=%i", i->exit_status); +#ifdef HAVE_SYSV_COMPAT if ((c = exit_status_to_string(i->exit_status, i->is_sysv ? EXIT_STATUS_LSB : EXIT_STATUS_SYSTEMD))) +#else + if ((c = exit_status_to_string(i->exit_status, EXIT_STATUS_SYSTEMD))) +#endif printf("/%s", c); } else @@ -1731,10 +1846,13 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn i->description = s; else if (streq(name, "FragmentPath")) i->path = s; +#ifdef HAVE_SYSV_COMPAT else if (streq(name, "SysVPath")) { i->is_sysv = true; i->path = s; - } else if (streq(name, "DefaultControlGroup")) + } +#endif + else if (streq(name, "DefaultControlGroup")) i->default_control_group = s; else if (streq(name, "StatusText")) i->status_text = s; @@ -1744,6 +1862,8 @@ static int status_property(const char *name, DBusMessageIter *iter, UnitStatusIn i->where = s; else if (streq(name, "What")) i->what = s; + else if (streq(name, "Following")) + i->following = s; } break; @@ -1923,6 +2043,14 @@ static int print_property(const char *name, DBusMessageIter *iter) { return 0; } + case DBUS_TYPE_DOUBLE: { + double d; + dbus_message_iter_get_basic(iter, &d); + + printf("%s=%g\n", name, d); + return 0; + } + case DBUS_TYPE_STRUCT: { DBusMessageIter sub; dbus_message_iter_recurse(iter, &sub); @@ -2190,19 +2318,13 @@ static int show_one(DBusConnection *bus, const char *path, bool show_properties, r = 0; - if (!show_properties) { - if (arg_sysv_compat && - !streq_ptr(info.active_state, "active") && - !streq_ptr(info.active_state, "reloading")) { + if (!show_properties) + print_status_info(&info); - /* 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); - } + if (!streq_ptr(info.active_state, "active") && + !streq_ptr(info.active_state, "reloading")) + /* According to LSB: "program not running" */ + r = 3; while ((p = info.exec)) { LIST_REMOVE(ExecStatusInfo, exec, info.exec, p); @@ -2223,7 +2345,7 @@ finish: static int show(DBusConnection *bus, char **args, unsigned n) { DBusMessage *m = NULL, *reply = NULL; - int r; + int r, ret = 0; DBusError error; unsigned i; bool show_properties, new_line = false; @@ -2239,7 +2361,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { /* If not argument is specified inspect the manager * itself */ - r = show_one(bus, "/org/freedesktop/systemd1", show_properties, &new_line); + ret = show_one(bus, "/org/freedesktop/systemd1", show_properties, &new_line); goto finish; } @@ -2257,7 +2379,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { "org.freedesktop.systemd1.Manager", "LoadUnit"))) { log_error("Could not allocate message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } @@ -2265,7 +2387,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { DBUS_TYPE_STRING, &args[i], DBUS_TYPE_INVALID)) { log_error("Could not append arguments to message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } @@ -2273,7 +2395,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { if (!dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) { log_error("Failed to issue method call: %s", bus_error_message(&error)); - r = -EIO; + ret = -EIO; goto finish; } @@ -2286,7 +2408,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { "org.freedesktop.systemd1.Manager", "GetUnit"))) { log_error("Could not allocate message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } @@ -2294,13 +2416,17 @@ static int show(DBusConnection *bus, char **args, unsigned n) { DBUS_TYPE_STRING, &args[i], DBUS_TYPE_INVALID)) { log_error("Could not append arguments to message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { log_error("Failed to issue method call: %s", bus_error_message(&error)); - r = -EIO; + + if (dbus_error_has_name(&error, BUS_ERROR_NO_SUCH_UNIT)) + ret = 4; /* According to LSB: "program or service status is unknown" */ + else + ret = -EIO; goto finish; } } @@ -2315,7 +2441,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { "org.freedesktop.systemd1.Manager", "GetJob"))) { log_error("Could not allocate message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } @@ -2323,13 +2449,13 @@ static int show(DBusConnection *bus, char **args, unsigned n) { DBUS_TYPE_UINT32, &id, DBUS_TYPE_INVALID)) { log_error("Could not append arguments to message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { log_error("Failed to issue method call: %s", bus_error_message(&error)); - r = -EIO; + ret = -EIO; goto finish; } } else { @@ -2342,7 +2468,7 @@ static int show(DBusConnection *bus, char **args, unsigned n) { "org.freedesktop.systemd1.Manager", "GetUnitByPID"))) { log_error("Could not allocate message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } @@ -2350,13 +2476,13 @@ static int show(DBusConnection *bus, char **args, unsigned n) { DBUS_TYPE_UINT32, &id, DBUS_TYPE_INVALID)) { log_error("Could not append arguments to message."); - r = -ENOMEM; + ret = -ENOMEM; goto finish; } if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { log_error("Failed to issue method call: %s", bus_error_message(&error)); - r = -EIO; + ret = -EIO; goto finish; } } @@ -2365,20 +2491,18 @@ static int show(DBusConnection *bus, char **args, unsigned n) { DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) { log_error("Failed to parse reply: %s", bus_error_message(&error)); - r = -EIO; + ret = -EIO; goto finish; } - if ((r = show_one(bus, path, show_properties, &new_line)) < 0) - goto finish; + if ((r = show_one(bus, path, show_properties, &new_line)) != 0) + ret = r; dbus_message_unref(m); dbus_message_unref(reply); m = reply = NULL; } - r = 0; - finish: if (m) dbus_message_unref(m); @@ -2388,7 +2512,7 @@ finish: dbus_error_free(&error); - return r; + return ret; } static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage *message, void *data) { @@ -2861,12 +2985,16 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { assert(arg_action == ACTION_SYSTEMCTL); method = - 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], "daemon-exit") ? "Exit" : - "Reload"; + streq(args[0], "clear-jobs") || + streq(args[0], "cancel") ? "ClearJobs" : + streq(args[0], "daemon-reexec") ? "Reexecute" : + streq(args[0], "reset-failed") ? "ResetFailed" : + streq(args[0], "halt") ? "Halt" : + streq(args[0], "poweroff") ? "PowerOff" : + streq(args[0], "reboot") ? "Reboot" : + streq(args[0], "kexec") ? "KExec" : + streq(args[0], "exit") ? "Exit" : + /* "daemon-reload" */ "Reload"; } if (!(m = dbus_message_new_method_call( @@ -2883,7 +3011,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { if (arg_action != ACTION_SYSTEMCTL && error_is_no_service(&error)) { /* There's always a fallback possible for * legacy actions. */ - r = 0; + r = -EADDRNOTAVAIL; goto finish; } @@ -2892,7 +3020,7 @@ static int daemon_reload(DBusConnection *bus, char **args, unsigned n) { goto finish; } - r = 1; + r = 0; finish: if (m) @@ -2906,7 +3034,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; @@ -2924,7 +3052,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; @@ -3120,6 +3248,7 @@ typedef struct { static Hashmap *will_install = NULL, *have_installed = NULL; static Set *remove_symlinks_to = NULL; +static unsigned n_symlinks = 0; static void install_info_free(InstallInfo *i) { assert(i); @@ -3140,28 +3269,16 @@ static void install_info_hashmap_free(Hashmap *m) { hashmap_free(m); } -static bool unit_name_valid(const char *name) { - - /* This is a minimal version of unit_name_valid() from - * unit-name.c */ - - if (!*name) - return false; - - if (ignore_file(name)) - return false; - - return true; -} - static int install_info_add(const char *name) { InstallInfo *i; int r; assert(will_install); - if (!unit_name_valid(name)) + if (!unit_name_is_valid_no_type(name, true)) { + log_warning("Unit name %s is not a valid unit name.", name); return -EINVAL; + } if (hashmap_get(have_installed, name) || hashmap_get(will_install, name)) @@ -3213,11 +3330,13 @@ static int config_parse_also( if (!(n = strndup(w, l))) return -ENOMEM; - r = install_info_add(n); - free(n); - - if (r < 0) + if ((r = install_info_add(n)) < 0) { + log_warning("Cannot install unit %s: %s", n, strerror(-r)); + free(n); return r; + } + + free(n); } return 0; @@ -3542,12 +3661,6 @@ static int install_info_symlink_alias(const char *verb, InstallInfo *i, const ch STRV_FOREACH(s, i->aliases) { - if (!unit_name_valid(*s)) { - log_error("Invalid name %s.", *s); - r = -EINVAL; - goto finish; - } - free(alias_path); if (!(alias_path = path_make_absolute(*s, config_path))) { log_error("Out of memory"); @@ -3561,7 +3674,6 @@ static int install_info_symlink_alias(const char *verb, InstallInfo *i, const ch if (streq(verb, "disable")) rmdir_parents(alias_path, config_path); } - r = 0; finish: @@ -3580,7 +3692,7 @@ static int install_info_symlink_wants(const char *verb, InstallInfo *i, const ch assert(config_path); STRV_FOREACH(s, i->wanted_by) { - if (!unit_name_valid(*s)) { + if (!unit_name_is_valid_no_type(*s, true)) { log_error("Invalid name %s.", *s); r = -EINVAL; goto finish; @@ -3669,6 +3781,9 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo return r; } + n_symlinks += strv_length(i->aliases); + n_symlinks += strv_length(i->wanted_by); + fclose(f); if ((r = install_info_symlink_alias(verb, i, config_path)) != 0) @@ -3743,8 +3858,10 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) { } for (j = 1; j < n; j++) - if ((r = install_info_add(args[j])) < 0) + if ((r = install_info_add(args[j])) < 0) { + log_warning("Cannot install unit %s: %s", args[j], strerror(-r)); goto finish; + } while ((i = hashmap_first(will_install))) { int q; @@ -3767,19 +3884,24 @@ static int enable_unit(DBusConnection *bus, char **args, unsigned n) { if (streq(verb, "is-enabled")) r = r > 0 ? 0 : -ENOENT; - else if (bus && - /* Don't try to reload anything if the user asked us to not do this */ - !arg_no_reload && - /* Don't try to reload anything when updating a unit globally */ - !arg_global && - /* Don't try to reload anything if we are called for system changes but the system wasn't booted with systemd */ - (arg_session || sd_booted() > 0) && - /* Don't try to reload anything if we are running in a chroot environment */ - (arg_session || running_in_chroot() <= 0) ) { - int q; + else { + if (n_symlinks <= 0) + log_warning("Unit files contain no applicable installation information. Ignoring."); + + if (bus && + /* Don't try to reload anything if the user asked us to not do this */ + !arg_no_reload && + /* Don't try to reload anything when updating a unit globally */ + !arg_global && + /* Don't try to reload anything if we are called for system changes but the system wasn't booted with systemd */ + (arg_session || sd_booted() > 0) && + /* Don't try to reload anything if we are running in a chroot environment */ + (arg_session || running_in_chroot() <= 0) ) { + int q; - if ((q = daemon_reload(bus, args, n)) < 0) - r = q; + if ((q = daemon_reload(bus, args, n)) < 0) + r = q; + } } finish: @@ -3800,6 +3922,7 @@ static int systemctl_help(void) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Send control commands to or query the systemd manager.\n\n" " -h --help Show this help\n" + " --version Show package version\n" " -t --type=TYPE List only units of a particular type\n" " -p --property=NAME Show only properties by this name\n" " -a --all Show all units/properties, including dead/empty ones\n" @@ -3816,7 +3939,8 @@ static int systemctl_help(void) { " --global Enable/disable unit files globally\n" " --no-reload When enabling/disabling unit files, don't reload daemon\n" " configuration\n" - " --force When enabling unit files, override existing symlinks\n" + " -f --force When enabling unit files, override existing symlinks\n" + " When shutting down, execute action immediately\n" " --defaults When disabling unit files, remove default symlinks only\n\n" "Commands:\n" " list-units List units\n" @@ -3834,8 +3958,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" @@ -3849,16 +3973,17 @@ static int systemctl_help(void) { " delete [NAME...] Remove one or more snapshots\n" " daemon-reload Reload systemd manager configuration\n" " daemon-reexec Reexecute systemd manager\n" - " daemon-exit Ask the systemd manager to quit\n" " show-environment Dump environment\n" " set-environment [NAME=VALUE...] Set one or more environment variables\n" " unset-environment [NAME...] Unset one or more environment variables\n" + " default Enter system default mode\n" + " rescue Enter system rescue mode\n" + " emergency Enter system emergency mode\n" " halt Shut down and halt the system\n" " poweroff Shut down and power-off the system\n" " reboot Shut down and reboot the system\n" - " rescue Enter system rescue mode\n" - " emergency Enter system emergency mode\n" - " default Enter system default mode\n", + " kexec Shut down and reboot the system with kexec\n" + " exit Ask for session termination\n", program_invocation_short_name); return 0; @@ -3934,6 +4059,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { enum { ARG_FAIL = 0x100, + ARG_VERSION, ARG_SESSION, ARG_SYSTEM, ARG_GLOBAL, @@ -3942,14 +4068,13 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_ORDER, ARG_REQUIRE, ARG_FULL, - ARG_FORCE, ARG_NO_RELOAD, - ARG_DEFAULTS, - ARG_SYSV_COMPAT + ARG_DEFAULTS }; static const struct option options[] = { { "help", no_argument, NULL, 'h' }, + { "version", no_argument, NULL, ARG_VERSION }, { "type", required_argument, NULL, 't' }, { "property", required_argument, NULL, 'p' }, { "all", no_argument, NULL, 'a' }, @@ -3963,10 +4088,9 @@ static int systemctl_parse_argv(int argc, char *argv[]) { { "quiet", no_argument, NULL, 'q' }, { "order", no_argument, NULL, ARG_ORDER }, { "require", no_argument, NULL, ARG_REQUIRE }, - { "force", no_argument, NULL, ARG_FORCE }, + { "force", no_argument, NULL, 'f' }, { "no-reload", no_argument, NULL, ARG_NO_RELOAD }, { "defaults", no_argument, NULL, ARG_DEFAULTS }, - { "sysv-compat", no_argument, NULL, ARG_SYSV_COMPAT }, { NULL, 0, NULL, 0 } }; @@ -3975,7 +4099,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "ht:p:aq", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "ht:p:aqf", options, NULL)) >= 0) { switch (c) { @@ -3983,6 +4107,12 @@ static int systemctl_parse_argv(int argc, char *argv[]) { systemctl_help(); return 0; + case ARG_VERSION: + puts(PACKAGE_STRING); + puts(DISTRIBUTION); + puts(SYSTEMD_FEATURES); + return 0; + case 't': arg_type = optarg; break; @@ -4043,7 +4173,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_quiet = true; break; - case ARG_FORCE: + case 'f': arg_force = true; break; @@ -4060,10 +4190,6 @@ 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; @@ -4566,7 +4692,7 @@ static int talk_upstart(void) { if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) { if (error_is_no_service(&error)) { - r = 0; + r = -EADDRNOTAVAIL; goto finish; } @@ -4575,7 +4701,7 @@ static int talk_upstart(void) { goto finish; } - r = 1; + r = 0; finish: if (m) @@ -4585,6 +4711,7 @@ finish: dbus_message_unref(reply); if (bus) { + dbus_connection_flush(bus); dbus_connection_close(bus); dbus_connection_unref(bus); } @@ -4667,17 +4794,18 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError { "delete", MORE, 2, delete_snapshot }, { "daemon-reload", EQUAL, 1, daemon_reload }, { "daemon-reexec", EQUAL, 1, daemon_reload }, - { "daemon-exit", EQUAL, 1, daemon_reload }, { "show-environment", EQUAL, 1, show_enviroment }, { "set-environment", MORE, 2, set_environment }, { "unset-environment", MORE, 2, set_environment }, { "halt", EQUAL, 1, start_special }, { "poweroff", EQUAL, 1, start_special }, { "reboot", EQUAL, 1, start_special }, + { "kexec", EQUAL, 1, start_special }, { "default", EQUAL, 1, start_special }, { "rescue", EQUAL, 1, start_special }, { "emergency", EQUAL, 1, start_special }, - { "reset-maintenance", MORE, 1, reset_maintenance }, + { "exit", EQUAL, 1, start_special }, + { "reset-failed", MORE, 1, reset_failed }, { "enable", MORE, 2, enable_unit }, { "disable", MORE, 2, enable_unit }, { "is-enabled", MORE, 2, enable_unit } @@ -4758,11 +4886,6 @@ static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) { 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); @@ -4785,24 +4908,12 @@ static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) { 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_namelen = offsetof(struct sockaddr_un, sun_path) + 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); @@ -4836,7 +4947,7 @@ static int start_with_fallback(DBusConnection *bus) { if (bus) { /* First, try systemd via D-Bus. */ - if (start_unit(bus, NULL, 0) > 0) + if (start_unit(bus, NULL, 0) >= 0) goto done; } @@ -4949,7 +5060,7 @@ static int runlevel_main(void) { } int main(int argc, char*argv[]) { - int r, retval = 1; + int r, retval = EXIT_FAILURE; DBusConnection *bus = NULL; DBusError error; @@ -4961,14 +5072,15 @@ int main(int argc, char*argv[]) { if ((r = parse_argv(argc, argv)) < 0) goto finish; else if (r == 0) { - retval = 0; + retval = EXIT_SUCCESS; goto finish; } /* /sbin/runlevel doesn't need to communicate via D-Bus, so * let's shortcut this */ if (arg_action == ACTION_RUNLEVEL) { - retval = runlevel_main() < 0; + r = runlevel_main(); + retval = r < 0 ? EXIT_FAILURE : r; goto finish; } @@ -4976,15 +5088,14 @@ int main(int argc, char*argv[]) { switch (arg_action) { - case ACTION_SYSTEMCTL: { - retval = systemctl_main(bus, argc, argv, &error) < 0; + case ACTION_SYSTEMCTL: + r = systemctl_main(bus, argc, argv, &error); break; - } case ACTION_HALT: case ACTION_POWEROFF: case ACTION_REBOOT: - retval = halt_main(bus) < 0; + r = halt_main(bus); break; case ACTION_RUNLEVEL2: @@ -4994,16 +5105,16 @@ int main(int argc, char*argv[]) { case ACTION_RESCUE: case ACTION_EMERGENCY: case ACTION_DEFAULT: - retval = start_with_fallback(bus) < 0; + r = start_with_fallback(bus); break; case ACTION_RELOAD: case ACTION_REEXEC: - retval = reload_with_fallback(bus) < 0; + r = reload_with_fallback(bus); break; case ACTION_CANCEL_SHUTDOWN: - retval = send_shutdownd(0, 0, false, NULL) < 0; + r = send_shutdownd(0, 0, false, NULL); break; case ACTION_INVALID: @@ -5012,9 +5123,12 @@ int main(int argc, char*argv[]) { assert_not_reached("Unknown action"); } + retval = r < 0 ? EXIT_FAILURE : r; + finish: if (bus) { + dbus_connection_flush(bus); dbus_connection_close(bus); dbus_connection_unref(bus); }