X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl.c;h=372b3d0ca662adeeaba24d5cbc4b541bf4c89f43;hp=ff6f86a0d2ef76036a35e6b8282945a837ec9c33;hb=7af53310dd9154ba76be7808292d9a046b849e43;hpb=ef639c5f9e9ed397424b50b14e2160993c7841d1 diff --git a/src/systemctl.c b/src/systemctl.c index ff6f86a0d..372b3d0ca 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include @@ -53,6 +55,7 @@ #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; @@ -71,7 +74,11 @@ static bool arg_quiet = false; static bool arg_full = false; static bool arg_force = false; static bool arg_defaults = false; +static bool arg_ask_password = false; static char **arg_wall = NULL; +static const char *arg_kill_who = NULL; +static const char *arg_kill_mode = NULL; +static int arg_signal = SIGTERM; static usec_t arg_when = 0; static enum action { ACTION_INVALID, @@ -79,6 +86,8 @@ static enum action { ACTION_HALT, ACTION_POWEROFF, ACTION_REBOOT, + ACTION_KEXEC, + ACTION_EXIT, ACTION_RUNLEVEL2, ACTION_RUNLEVEL3, ACTION_RUNLEVEL4, @@ -111,6 +120,47 @@ static bool on_tty(void) { return t; } +static void spawn_ask_password_agent(void) { + pid_t parent, child; + + /* We check STDIN here, not STDOUT, since this is about input, + * not output */ + if (!isatty(STDIN_FILENO)) + return; + + if (!arg_ask_password) + return; + + parent = getpid(); + + /* Spawns a temporary TTY agent, making sure it goes away when + * we go away */ + + if ((child = fork()) < 0) + return; + + if (child == 0) { + /* In the child */ + + const char * const args[] = { + SYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH, + "--watch", + NULL + }; + + if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0) + _exit(EXIT_FAILURE); + + /* Check whether our parent died before we were able + * to set the death signal */ + if (getppid() != parent) + _exit(EXIT_SUCCESS); + + execv(args[0], (char **) args); + _exit(EXIT_FAILURE); + } +} + static const char *ansi_highlight(bool b) { if (!on_tty()) @@ -191,6 +241,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!" }; @@ -207,7 +258,7 @@ static void warn_wall(enum action action) { } if (*p) { - utmp_wall(p); + utmp_wall(p, NULL); free(p); return; } @@ -218,7 +269,7 @@ static void warn_wall(enum action action) { if (!table[action]) return; - utmp_wall(table[action]); + utmp_wall(table[action], NULL); } struct unit_info { @@ -251,12 +302,116 @@ 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, n_shown = 0; + 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; + + n_shown++; + + 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", n_shown); + else + printf("\n%u units listed. Pass --all to see inactive units, too.\n", n_shown); + } +} + 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); @@ -336,82 +491,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) { } qsort(unit_infos, c, sizeof(struct unit_info), compare_unit_info); - - if (on_tty()) { - 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(u->active_state, "inactive") || u->following[0]) || u->job_id > 0)) { - char *e; - int a = 0, b = 0; - 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, "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); - - free(e); - - a -= strlen(on_loaded) + strlen(off_loaded); - a -= strlen(on_active) + strlen(off_active); - - if (u->job_id != 0) - printf(" %-15s%n", u->job_type, &b); - else - b = 1 + 15; - - if (a + b + 1 < columns()) { - if (u->job_id == 0) - printf(" "); - - 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); - } + output_units_list(unit_infos, c); r = 0; @@ -1082,7 +1162,7 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) { ; if (!arg_quiet && d.failed) - log_error("Job failed, see system logs for details."); + log_error("Job failed. See system logs and 'systemctl status' for details."); r = d.failed ? -EIO : 0; @@ -1191,12 +1271,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; } @@ -1207,13 +1291,15 @@ 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, ret = 0; @@ -1226,16 +1312,18 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) { assert(bus); + spawn_ask_password_agent(); + if (arg_action == ACTION_SYSTEMCTL) { method = 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 = @@ -1308,6 +1396,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) @@ -1360,6 +1456,7 @@ static int check_unit(DBusConnection *bus, char **args, unsigned n) { puts("unknown"); dbus_error_free(&error); + dbus_message_unref(m); continue; } @@ -1438,6 +1535,71 @@ finish: return r; } +static int kill_unit(DBusConnection *bus, char **args, unsigned n) { + DBusMessage *m = NULL, *reply = NULL; + int r = 0; + DBusError error; + unsigned i; + + assert(bus); + assert(args); + + dbus_error_init(&error); + + if (!arg_kill_who) + arg_kill_who = "all"; + + if (!arg_kill_mode) + arg_kill_mode = streq(arg_kill_who, "all") ? "control-group" : "process"; + + for (i = 1; i < n; i++) { + + if (!(m = dbus_message_new_method_call( + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "KillUnit"))) { + log_error("Could not allocate message."); + r = -ENOMEM; + goto finish; + } + + if (!dbus_message_append_args(m, + DBUS_TYPE_STRING, &args[i], + DBUS_TYPE_STRING, &arg_kill_who, + DBUS_TYPE_STRING, &arg_kill_mode, + DBUS_TYPE_INT32, &arg_signal, + DBUS_TYPE_INVALID)) { + log_error("Could not append arguments to message."); + r = -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)); + dbus_error_free(&error); + r = -EIO; + } + + dbus_message_unref(m); + + if (reply) + dbus_message_unref(reply); + m = reply = NULL; + } + +finish: + if (m) + dbus_message_unref(m); + + if (reply) + dbus_message_unref(reply); + + dbus_error_free(&error); + + return r; +} + typedef struct ExecStatusInfo { char *path; char **argv; @@ -1539,6 +1701,7 @@ typedef struct UnitStatusInfo { const char *sub_state; const char *description; + const char *following; const char *path; const char *default_control_group; @@ -1555,7 +1718,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; @@ -1598,7 +1763,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 @@ -1643,17 +1812,17 @@ 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"); if (i->sysfs_path) printf("\t Device: %s\n", i->sysfs_path); - else if (i->where) + if (i->where) printf("\t Where: %s\n", i->where); - else if (i->what) + if (i->what) printf("\t What: %s\n", i->what); if (i->accept) @@ -1675,7 +1844,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 @@ -1713,7 +1886,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 @@ -1785,10 +1962,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; @@ -1798,6 +1978,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; @@ -1977,6 +2159,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); @@ -2911,12 +3101,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-failed") ? "ResetFailed" : - 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( @@ -3170,6 +3364,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); @@ -3190,28 +3385,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)) @@ -3263,11 +3446,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; @@ -3592,12 +3777,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"); @@ -3611,7 +3790,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: @@ -3630,7 +3808,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; @@ -3719,6 +3897,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) @@ -3793,8 +3974,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; @@ -3817,19 +4000,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: @@ -3849,26 +4037,32 @@ 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" - " --full Don't ellipsize unit names on output\n" - " --fail When queueing a new job, fail if conflicting jobs are\n" - " pending\n" - " -q --quiet Suppress output\n" - " --no-block Do not wait until operation finished\n" - " --system Connect to system bus\n" - " --session Connect to session bus\n" - " --order When generating graph for dot, show only order\n" - " --require When generating graph for dot, show only requirement\n" - " --no-wall Don't send wall message before halt/power-off/reboot\n" - " --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" - " --defaults When disabling unit files, remove default symlinks only\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" + " --full Don't ellipsize unit names on output\n" + " --fail When queueing a new job, fail if conflicting jobs are\n" + " pending\n" + " -q --quiet Suppress output\n" + " --no-block Do not wait until operation finished\n" + " --system Connect to system bus\n" + " --session Connect to session bus\n" + " --order When generating graph for dot, show only order\n" + " --require When generating graph for dot, show only requirement\n" + " --no-wall Don't send wall message before halt/power-off/reboot\n" + " --global Enable/disable unit files globally\n" + " --no-reload When enabling/disabling unit files, don't reload daemon\n" + " configuration\n" + " --no-ask-password\n" + " Do not ask for system passwords\n" + " --kill-mode=MODE How to send signal\n" + " --kill-who=WHO Who to send signal to\n" + " -s --signal=SIGNAL Which signal to send\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" " start [NAME...] Start (activate) one or more units\n" @@ -3881,6 +4075,7 @@ static int systemctl_help(void) { " reload-or-try-restart [NAME...] Reload one or more units is possible,\n" " otherwise restart if active\n" " isolate [NAME] Start one unit and stop all others\n" + " kill [NAME...] Send signal to processes of a unit\n" " is-active [NAME...] Check whether units are active\n" " status [NAME...|PID...] Show runtime status of one or more units\n" " show [NAME...|JOB...] Show properties of one or more\n" @@ -3900,16 +4095,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; @@ -3994,9 +4190,11 @@ static int systemctl_parse_argv(int argc, char *argv[]) { ARG_ORDER, ARG_REQUIRE, ARG_FULL, - ARG_FORCE, ARG_NO_RELOAD, - ARG_DEFAULTS + ARG_DEFAULTS, + ARG_KILL_MODE, + ARG_KILL_WHO, + ARG_NO_ASK_PASSWORD }; static const struct option options[] = { @@ -4015,9 +4213,13 @@ 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 }, + { "kill-mode", required_argument, NULL, ARG_KILL_MODE }, + { "kill-who", required_argument, NULL, ARG_KILL_WHO }, + { "signal", required_argument, NULL, 's' }, + { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, { NULL, 0, NULL, 0 } }; @@ -4026,7 +4228,10 @@ 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) { + /* Only when running as systemctl we ask for passwords */ + arg_ask_password = true; + + while ((c = getopt_long(argc, argv, "ht:p:aqfs:", options, NULL)) >= 0) { switch (c) { @@ -4100,7 +4305,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_quiet = true; break; - case ARG_FORCE: + case 'f': arg_force = true; break; @@ -4117,6 +4322,25 @@ static int systemctl_parse_argv(int argc, char *argv[]) { arg_defaults = true; break; + case ARG_KILL_WHO: + arg_kill_who = optarg; + break; + + case ARG_KILL_MODE: + arg_kill_mode = optarg; + break; + + case 's': + if ((arg_signal = signal_from_string_try_harder(optarg)) < 0) { + log_error("Failed to parse signal string %s.", optarg); + return -EINVAL; + } + break; + + case ARG_NO_ASK_PASSWORD: + arg_ask_password = false; + break; + case '?': return -EINVAL; @@ -4710,6 +4934,7 @@ static int systemctl_main(DBusConnection *bus, int argc, char *argv[], DBusError { "force-reload", MORE, 2, start_unit }, /* For compatibility with SysV */ { "condrestart", MORE, 2, start_unit }, /* For compatibility with RH */ { "isolate", EQUAL, 2, start_unit }, + { "kill", MORE, 2, kill_unit }, { "is-active", MORE, 2, check_unit }, { "check", MORE, 2, check_unit }, { "show", MORE, 1, show }, @@ -4721,16 +4946,17 @@ 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 }, + { "exit", EQUAL, 1, start_special }, { "reset-failed", MORE, 1, reset_failed }, { "enable", MORE, 2, enable_unit }, { "disable", MORE, 2, enable_unit }, @@ -4836,7 +5062,7 @@ static int send_shutdownd(usec_t t, char mode, bool warn, const char *message) { 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;