X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl%2Fsystemctl.c;h=66c0b9949e44dd3b3e06c7ac547a0bebbca2cd58;hp=20c765e53285de4dff904aebc938db2ce4ce620f;hb=b986229efe2cc96157aa14c37bab7843311bbef1;hpb=3c7560019e623e6e0d03a860b4f19a3a8715feca diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 20c765e53..66c0b9949 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -176,7 +176,6 @@ static void ask_password_agent_open_if_enabled(void) { ask_password_agent_open(); } -#ifdef HAVE_LOGIND static void polkit_agent_open_if_enabled(void) { /* Open the polkit agent as a child process if necessary */ @@ -192,15 +191,14 @@ static void polkit_agent_open_if_enabled(void) { polkit_agent_open(); } -#endif static OutputFlags get_output_flags(void) { return arg_all * OUTPUT_SHOW_ALL | + arg_full * OUTPUT_FULL_WIDTH | (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | on_tty() * OUTPUT_COLOR | - !arg_quiet * OUTPUT_WARN_CUTOFF | - arg_full * OUTPUT_FULL_WIDTH; + !arg_quiet * OUTPUT_WARN_CUTOFF; } static int translate_bus_error_to_exit_status(int r, const sd_bus_error *error) { @@ -436,14 +434,12 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) { n_shown++; - if (STR_IN_SET(u->load_state, "error", "not-found", "masked")) { + if (STR_IN_SET(u->load_state, "error", "not-found", "masked") && !arg_plain) { on_loaded = ansi_highlight_red(); on_circle = ansi_highlight_yellow(); off_loaded = off_circle = ansi_highlight_off(); circle = true; - } - - if (streq(u->active_state, "failed")) { + } else if (streq(u->active_state, "failed") && !arg_plain) { on_circle = on_active = ansi_highlight_red(); off_circle = off_active = ansi_highlight_off(); circle = true; @@ -1616,8 +1612,6 @@ static int list_dependencies_one( qsort_safe(deps, strv_length(deps), sizeof (char*), list_dependencies_compare); STRV_FOREACH(c, deps) { - int state; - if (strv_contains(*units, *c)) { if (!arg_plain) { r = list_dependencies_print("...", level + 1, (branches << 1) | (c[1] == NULL ? 0 : 1), 1); @@ -1627,11 +1621,16 @@ static int list_dependencies_one( continue; } - state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true); - if (state > 0) - printf("%s%s%s ", ansi_highlight_green(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off()); - else - printf("%s%s%s ", ansi_highlight_red(), draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off()); + if (arg_plain) + printf(" "); + else { + int state; + const char *on; + + state = check_one_unit(bus, *c, "activating\0active\0reloading\0", true); + on = state > 0 ? ansi_highlight_green() : ansi_highlight_red(); + printf("%s%s%s ", on, draw_special_char(DRAW_BLACK_CIRCLE), ansi_highlight_off()); + } r = list_dependencies_print(*c, level, branches, c[1] == NULL); if (r < 0) @@ -1827,7 +1826,7 @@ static void output_machines_list(struct machine_info *machine_infos, unsigned n) failedlen = MAX(failedlen, DECIMAL_STR_WIDTH(m->n_failed_units)); jobslen = MAX(jobslen, DECIMAL_STR_WIDTH(m->n_jobs)); - if (!arg_no_legend && !streq_ptr(m->state, "running")) + if (!arg_plain && !streq_ptr(m->state, "running")) circle_len = 2; } @@ -2037,10 +2036,12 @@ static void output_jobs_list(const struct job_info* jobs, unsigned n, bool skipp assert(n == 0 || jobs); if (n == 0) { - on = ansi_highlight_green(); - off = ansi_highlight_off(); + if (!arg_no_legend) { + on = ansi_highlight_green(); + off = ansi_highlight_off(); - printf("%sNo jobs %s.%s\n", on, skipped ? "listed" : "running", off); + printf("%sNo jobs %s.%s\n", on, skipped ? "listed" : "running", off); + } return; } @@ -2706,6 +2707,7 @@ static int start_unit(sd_bus *bus, char **args) { assert(bus); ask_password_agent_open_if_enabled(); + polkit_agent_open_if_enabled(); if (arg_action == ACTION_SYSTEMCTL) { enum action action; @@ -2953,6 +2955,12 @@ static int start_special(sd_bus *bus, char **args) { return -EPERM; } + if (a == ACTION_REBOOT) { + r = update_reboot_param_file(args[1]); + if (r < 0) + return r; + } + if (arg_force >= 2 && (a == ACTION_HALT || a == ACTION_POWEROFF || @@ -3029,6 +3037,8 @@ static int kill_unit(sd_bus *bus, char **args) { assert(bus); assert(args); + polkit_agent_open_if_enabled(); + if (!arg_kill_who) arg_kill_who = "all"; @@ -3220,6 +3230,10 @@ typedef struct UnitStatusInfo { /* Swap */ const char *what; + /* CGroup */ + uint64_t memory_current; + uint64_t memory_limit; + LIST_HEAD(ExecStatusInfo, exec); } UnitStatusInfo; @@ -3395,7 +3409,7 @@ static void print_status_info( continue; argv = strv_join(p->argv, " "); - printf(" Process: %u %s=%s ", p->pid, p->name, strna(argv)); + printf(" Process: "PID_FMT" %s=%s ", p->pid, p->name, strna(argv)); good = is_clean_exit_lsb(p->code, p->status, NULL); if (!good) { @@ -3478,6 +3492,17 @@ static void print_status_info( if (i->status_errno > 0) printf(" Error: %i (%s)\n", i->status_errno, strerror(i->status_errno)); + if (i->memory_current != (uint64_t) -1) { + char buf[FORMAT_BYTES_MAX]; + + printf(" Memory: %s", format_bytes(buf, sizeof(buf), i->memory_current)); + + if (i->memory_limit != (uint64_t) -1) + printf(" (limit: %s)\n", format_bytes(buf, sizeof(buf), i->memory_limit)); + else + printf("\n"); + } + if (i->control_group && (i->main_pid > 0 || i->control_pid > 0 || ((arg_transport != BUS_TRANSPORT_LOCAL && arg_transport != BUS_TRANSPORT_MACHINE) || cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, i->control_group, false) == 0))) { @@ -3692,6 +3717,10 @@ static int status_property(const char *name, sd_bus_message *m, UnitStatusInfo * i->condition_timestamp = (usec_t) u; else if (streq(name, "AssertTimestamp")) i->assert_timestamp = (usec_t) u; + else if (streq(name, "MemoryCurrent")) + i->memory_current = u; + else if (streq(name, "MemoryLimit")) + i->memory_limit = u; break; } @@ -4162,7 +4191,10 @@ static int show_one( _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - UnitStatusInfo info = {}; + UnitStatusInfo info = { + .memory_current = (uint64_t) -1, + .memory_limit = (uint64_t) -1, + }; ExecStatusInfo *p; int r; @@ -4288,7 +4320,7 @@ static int get_unit_dbus_path_by_pid( &reply, "u", pid); if (r < 0) { - log_error("Failed to get unit for PID "PID_FMT": %s", pid, bus_error_message(&error, r)); + log_error("Failed to get unit for PID %"PRIu32": %s", pid, bus_error_message(&error, r)); return r; } @@ -4601,6 +4633,8 @@ static int set_property(sd_bus *bus, char **args) { char **i; int r; + polkit_agent_open_if_enabled(); + r = sd_bus_message_new_method_call( bus, &m, @@ -4661,6 +4695,8 @@ static int snapshot(sd_bus *bus, char **args) { const char *path; int r; + polkit_agent_open_if_enabled(); + if (strv_length(args) > 1) n = unit_name_mangle_with_suffix(args[1], MANGLE_NOGLOB, ".snapshot"); else @@ -4723,6 +4759,8 @@ static int delete_snapshot(sd_bus *bus, char **args) { assert(args); + polkit_agent_open_if_enabled(); + r = expand_names(bus, args + 1, ".snapshot", &names); if (r < 0) log_error_errno(r, "Failed to expand names: %m"); @@ -4766,6 +4804,8 @@ static int daemon_reload(sd_bus *bus, char **args) { const char *method; int r; + polkit_agent_open_if_enabled(); + if (arg_action == ACTION_RELOAD) method = "Reload"; else if (arg_action == ACTION_REEXEC) @@ -4824,6 +4864,8 @@ static int reset_failed(sd_bus *bus, char **args) { if (strv_length(args) <= 1) return daemon_reload(bus, args); + polkit_agent_open_if_enabled(); + r = expand_names(bus, args + 1, NULL, &names); if (r < 0) log_error_errno(r, "Failed to expand names: %m"); @@ -5285,6 +5327,8 @@ static int enable_unit(sd_bus *bus, char **args) { bool send_force = true, send_preset_mode = false; const char *method; + polkit_agent_open_if_enabled(); + if (streq(verb, "enable")) { method = "EnableUnitFiles"; expect_carries_install_info = true; @@ -5430,6 +5474,8 @@ static int add_dependency(sd_bus *bus, char **args) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL, *m = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + polkit_agent_open_if_enabled(); + r = sd_bus_message_new_method_call( bus, &m, @@ -5493,6 +5539,8 @@ static int preset_all(sd_bus *bus, char **args) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + polkit_agent_open_if_enabled(); + r = sd_bus_message_new_method_call( bus, &m, @@ -5652,7 +5700,7 @@ static int create_edit_temp_file(const char *new_path, const char *original_path return r; } - r = copy_file(original_path, t, 0, 0644); + r = copy_file(original_path, t, 0, 0644, 0); if (r == -ENOENT) { r = touch(t); if (r < 0) { @@ -5985,8 +6033,8 @@ static void systemctl_help(void) { " Operate on remote host\n" " -M --machine=CONTAINER\n" " Operate on local container\n" - " -t --type=TYPE List only units of a particular type\n" - " --state=STATE List only units with particular LOAD or SUB or ACTIVE state\n" + " -t --type=TYPE List units of a particular type\n" + " --state=STATE List units with particular LOAD or SUB or ACTIVE state\n" " -p --property=NAME Show only properties by this name\n" " -a --all Show all loaded units/properties, including dead/empty\n" " ones. To list all units installed on the system, use\n" @@ -6004,8 +6052,7 @@ static void systemctl_help(void) { " -q --quiet Suppress output\n" " --no-block Do not wait until operation finished\n" " --no-wall Don't send wall message before halt/power-off/reboot\n" - " --no-reload When enabling/disabling unit files, don't reload daemon\n" - " configuration\n" + " --no-reload Don't reload daemon after en-/dis-abling unit files\n" " --no-legend Do not print a legend (column headers and hints)\n" " --no-pager Do not pipe output into a pager\n" " --no-ask-password\n" @@ -6014,12 +6061,12 @@ static void systemctl_help(void) { " --runtime Enable unit files only temporarily until next reboot\n" " -f --force When enabling unit files, override existing symlinks\n" " When shutting down, execute action immediately\n" - " --preset-mode= Specifies whether fully apply presets, or only enable,\n" - " or only disable\n" + " --preset-mode= Apply only enable, only disable, or all presets\n" " --root=PATH Enable unit files in the specified root directory\n" " -n --lines=INTEGER Number of journal entries to show\n" - " -o --output=STRING Change journal output mode (short, short-monotonic,\n" - " verbose, export, json, json-pretty, json-sse, cat)\n" + " -o --output=STRING Change journal output mode (short, short-iso,\n" + " short-precise, short-monotonic, verbose,\n" + " export, json, json-pretty, json-sse, cat)\n" " --plain Print unit dependencies as a list instead of a tree\n\n" "Unit Commands:\n" " list-units [PATTERN...] List loaded units\n" @@ -6058,7 +6105,7 @@ static void systemctl_help(void) { " based on preset configuration\n" " preset-all Enable/disable all unit files based on\n" " preset configuration\n" - " is-enabled NAME... Check whether unit files are enabled\n\n" + " is-enabled NAME... Check whether unit files are enabled\n" " mask NAME... Mask one or more units\n" " unmask NAME... Unmask one or more units\n" " link PATH... Link one or more units files into\n" @@ -6067,10 +6114,9 @@ static void systemctl_help(void) { " on specified one or more units\n" " add-requires TARGET NAME... Add 'Requires' dependency for the target\n" " on specified one or more units\n" - " get-default Get the name of the default target\n" - " set-default NAME Set the default target\n" " edit NAME... Edit one or more unit files\n" - "\n" + " get-default Get the name of the default target\n" + " set-default NAME Set the default target\n\n" "Machine Commands:\n" " list-machines [PATTERN...] List local containers and host\n\n" "Job Commands:\n" @@ -6083,7 +6129,7 @@ static void systemctl_help(void) { " 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" - " import-environment NAME... Import all, one or more environment variables\n\n" + " import-environment [NAME...] Import all or some environment variables\n\n" "Manager Lifecycle Commands:\n" " daemon-reload Reload systemd manager configuration\n" " daemon-reexec Reexecute systemd manager\n\n" @@ -7053,7 +7099,7 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { { "import-environment", MORE, 1, import_environment}, { "halt", EQUAL, 1, start_special, FORCE }, { "poweroff", EQUAL, 1, start_special, FORCE }, - { "reboot", EQUAL, 1, start_special, FORCE }, + { "reboot", MORE, 1, start_special, FORCE }, { "kexec", EQUAL, 1, start_special }, { "suspend", EQUAL, 1, start_special }, { "hibernate", EQUAL, 1, start_special },