X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl%2Fsystemctl.c;h=74528dd5b6cbbefae35d610b0af78c745ab76085;hp=47b0aac03e75c950ef388369fc1d643824c61eb3;hb=b619ec8f83ee3f524dae1f4692b26731bbe68616;hpb=7d4fb3b1c5ec7a117bd5a36e4591819a64e00136 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 47b0aac03..74528dd5b 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -72,9 +72,9 @@ #include "bus-util.h" #include "bus-message.h" #include "bus-error.h" -#include "bus-errors.h" -#include "copy.h" +#include "bus-common-errors.h" #include "mkdir.h" +#include "dropin.h" static char **arg_types = NULL; static char **arg_states = NULL; @@ -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,7 +191,15 @@ 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; +} static int translate_bus_error_to_exit_status(int r, const sd_bus_error *error) { assert(error); @@ -622,7 +629,7 @@ static int get_unit_list_recursive( _cleanup_bus_close_unref_ sd_bus *container = NULL; int k; - r = sd_bus_open_system_container(&container, *i); + r = sd_bus_open_system_machine(&container, *i); if (r < 0) { log_error_errno(r, "Failed to connect to container %s: %m", *i); continue; @@ -753,7 +760,7 @@ struct socket_info { /* Note: triggered is a list here, although it almost certainly * will always be one unit. Nevertheless, dbus API allows for multiple - * values, so let's follow that.*/ + * values, so let's follow that. */ char** triggered; /* The strv above is shared. free is set only in the first one. */ @@ -1713,7 +1720,7 @@ static int get_machine_properties(sd_bus *bus, struct machine_info *mi) { assert(mi); if (!bus) { - r = sd_bus_open_system_container(&container, mi->name); + r = sd_bus_open_system_machine(&container, mi->name); if (r < 0) return r; @@ -1951,32 +1958,6 @@ static void dump_unit_file_changes(const UnitFileChange *changes, unsigned n_cha } } -static int deserialize_and_dump_unit_file_changes(sd_bus_message *m) { - const char *type, *path, *source; - int r; - - r = sd_bus_message_enter_container(m, SD_BUS_TYPE_ARRAY, "(sss)"); - if (r < 0) - return bus_log_parse_error(r); - - while ((r = sd_bus_message_read(m, "(sss)", &type, &path, &source)) > 0) { - if (!arg_quiet) { - if (streq(type, "symlink")) - log_info("Created symlink from %s to %s.", path, source); - else - log_info("Removed symlink %s.", path); - } - } - if (r < 0) - return bus_log_parse_error(r); - - r = sd_bus_message_exit_container(m); - if (r < 0) - return bus_log_parse_error(r); - - return 0; -} - static int set_default(sd_bus *bus, char **args) { _cleanup_free_ char *unit = NULL; UnitFileChange *changes = NULL; @@ -2024,7 +2005,7 @@ static int set_default(sd_bus *bus, char **args) { return r; } - r = deserialize_and_dump_unit_file_changes(reply); + r = bus_deserialize_and_dump_unit_file_changes(reply, arg_quiet); if (r < 0) return r; @@ -2271,180 +2252,136 @@ static int need_daemon_reload(sd_bus *bus, const char *unit) { return b; } -typedef struct WaitData { - Set *set; - - char *name; - char *result; -} WaitData; - -static int wait_filter(sd_bus *bus, sd_bus_message *m, void *data, sd_bus_error *error) { - WaitData *d = data; - - assert(bus); - assert(m); - assert(d); - - log_debug("Got D-Bus request: %s.%s() on %s", - sd_bus_message_get_interface(m), - sd_bus_message_get_member(m), - sd_bus_message_get_path(m)); - - if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) { - log_error("Warning! D-Bus connection terminated."); - sd_bus_close(bus); - } else if (sd_bus_message_is_signal(m, "org.freedesktop.systemd1.Manager", "JobRemoved")) { - uint32_t id; - const char *path, *result, *unit; - char *ret; - int r; - - r = sd_bus_message_read(m, "uoss", &id, &path, &unit, &result); - if (r >= 0) { - ret = set_remove(d->set, (char*) path); - if (!ret) - return 0; - - free(ret); - - if (!isempty(result)) - d->result = strdup(result); +static void warn_unit_file_changed(const char *name) { + log_warning("%sWarning:%s %s changed on disk. Run 'systemctl%s daemon-reload' to reload units.", + ansi_highlight_red(), + ansi_highlight_off(), + name, + arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); +} - if (!isempty(unit)) - d->name = strdup(unit); +static int unit_file_find_path(LookupPaths *lp, const char *unit_name, char **unit_path) { + char **p; - return 0; - } -#ifndef NOLEGACY - r = sd_bus_message_read(m, "uos", &id, &path, &result); - if (r >= 0) { - ret = set_remove(d->set, (char*) path); - if (!ret) - return 0; + assert(lp); + assert(unit_name); + assert(unit_path); - free(ret); + STRV_FOREACH(p, lp->unit_path) { + _cleanup_free_ char *path; - if (*result) - d->result = strdup(result); + path = path_join(arg_root, *p, unit_name); + if (!path) + return log_oom(); - return 0; + if (access(path, F_OK) == 0) { + *unit_path = path; + path = NULL; + return 1; } -#endif - - bus_log_parse_error(r); } return 0; } -static int enable_wait_for_jobs(sd_bus *bus) { +static int unit_find_paths(sd_bus *bus, + const char *unit_name, + bool avoid_bus_cache, + LookupPaths *lp, + char **fragment_path, + char ***dropin_paths) { int r; - assert(bus); - - r = sd_bus_add_match( - bus, - NULL, - "type='signal'," - "sender='org.freedesktop.systemd1'," - "interface='org.freedesktop.systemd1.Manager'," - "member='JobRemoved'," - "path='/org/freedesktop/systemd1'", - NULL, NULL); - if (r < 0) { - log_error("Failed to add match"); - return -EIO; - } - - /* This is slightly dirty, since we don't undo the match registrations. */ - return 0; -} + /** + * Finds where the unit is defined on disk. Returns 0 if the unit + * is not found. Returns 1 if it is found, and sets + * - the path to the unit in *path, if it exists on disk, + * - and a strv of existing drop-ins in *dropins, + * if the arg is not NULL and any dropins were found. + */ -static int bus_process_wait(sd_bus *bus) { - int r; + assert(unit_name); + assert(fragment_path); + assert(lp); - for (;;) { - r = sd_bus_process(bus, NULL); - if (r < 0) - return r; - if (r > 0) - return 0; - r = sd_bus_wait(bus, (uint64_t) -1); - if (r < 0) - return r; - } -} + if (!avoid_bus_cache && !unit_name_is_template(unit_name)) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_free_ char *unit = NULL; + _cleanup_free_ char *path = NULL; + _cleanup_strv_free_ char **dropins = NULL; -static int check_wait_response(WaitData *d) { - int r = 0; + unit = unit_dbus_path_from_name(unit_name); + if (!unit) + return log_oom(); - assert(d->result); + if (need_daemon_reload(bus, unit_name) > 0) + warn_unit_file_changed(unit_name); - if (!arg_quiet) { - if (streq(d->result, "timeout")) - log_error("Job for %s timed out.", strna(d->name)); - else if (streq(d->result, "canceled")) - log_error("Job for %s canceled.", strna(d->name)); - else if (streq(d->result, "dependency")) - log_error("A dependency job for %s failed. See 'journalctl -xe' for details.", strna(d->name)); - else if (!streq(d->result, "done") && !streq(d->result, "skipped")) { - if (d->name) { - bool quotes; + r = sd_bus_get_property_string( + bus, + "org.freedesktop.systemd1", + unit, + "org.freedesktop.systemd1.Unit", + "FragmentPath", + &error, + &path); + if (r < 0) + return log_error_errno(r, "Failed to get FragmentPath: %s", bus_error_message(&error, r)); - quotes = chars_intersect(d->name, SHELL_NEED_QUOTES); + r = sd_bus_get_property_strv( + bus, + "org.freedesktop.systemd1", + unit, + "org.freedesktop.systemd1.Unit", + "DropInPaths", + &error, + &dropins); + if (r < 0) + return log_error_errno(r, "Failed to get DropInPaths: %s", bus_error_message(&error, r)); - log_error("Job for %s failed. See \"systemctl status %s%s%s\" and \"journalctl -xe\" for details.", - d->name, - quotes ? "'" : "", d->name, quotes ? "'" : ""); - } else - log_error("Job failed. See \"journalctl -xe\" for details."); + r = 0; + if (!isempty(path)) { + *fragment_path = path; + path = NULL; + r = 1; } - } - if (streq(d->result, "timeout")) - r = -ETIME; - else if (streq(d->result, "canceled")) - r = -ECANCELED; - else if (streq(d->result, "dependency")) - r = -EIO; - else if (!streq(d->result, "done") && !streq(d->result, "skipped")) - r = -EIO; + if (dropin_paths && !strv_isempty(dropins)) { + *dropin_paths = dropins; + dropins = NULL; + r = 1; + } + } else { + _cleanup_set_free_ Set *names; - return r; -} + names = set_new(NULL); + if (!names) + return -ENOMEM; -static int wait_for_jobs(sd_bus *bus, Set *s) { - _cleanup_bus_slot_unref_ sd_bus_slot *slot = NULL; - WaitData d = { .set = s }; - int r = 0, q; + r = set_put(names, unit_name); + if (r < 0) + return r; - assert(bus); - assert(s); + r = unit_file_find_path(lp, unit_name, fragment_path); + if (r < 0) + return r; - q = sd_bus_add_filter(bus, &slot, wait_filter, &d); - if (q < 0) - return log_oom(); + if (r == 0) { + _cleanup_free_ char *template; - while (!set_isempty(s)) { - q = bus_process_wait(bus); - if (q < 0) - return log_error_errno(q, "Failed to wait for response: %m"); + template = unit_name_template(unit_name); + if (!template) + return log_oom(); - if (d.result) { - q = check_wait_response(&d); - /* Return the first error as it is most likely to be - * meaningful. */ - if (q < 0 && r == 0) - r = q; - log_debug("Got result %s/%s for job %s", - strna(d.result), strerror(-q), strna(d.name)); + if (!streq(template, unit_name)) { + r = unit_file_find_path(lp, template, fragment_path); + if (r < 0) + return r; + } } - free(d.name); - d.name = NULL; - - free(d.result); - d.result = NULL; + if (dropin_paths) + r = unit_file_find_dropin_paths(lp->unit_path, NULL, names, dropin_paths); } return r; @@ -2614,7 +2551,7 @@ static int start_unit_one( const char *name, const char *mode, sd_bus_error *error, - Set *s) { + BusWaitForJobs *w) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL, *reply = NULL; const char *path; @@ -2665,18 +2602,11 @@ static int start_unit_one( return bus_log_parse_error(r); if (need_daemon_reload(bus, name) > 0) - log_warning("Warning: Unit file of %s changed on disk, 'systemctl%s daemon-reload' recommended.", - name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); - - if (s) { - char *p; - - p = strdup(path); - if (!p) - return log_oom(); + warn_unit_file_changed(name); - log_debug("Adding %s to the set", p); - r = set_consume(s, p); + if (w) { + log_debug("Adding %s to the set", path); + r = bus_wait_for_jobs_add(w, path); if (r < 0) return log_oom(); } @@ -2714,6 +2644,9 @@ static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***r _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_free_ UnitInfo *unit_infos = NULL; + if (!bus) + return log_error_errno(ENOTSUP, "Unit name globbing without bus is not implemented."); + r = get_unit_list(bus, NULL, globs, &unit_infos, 0, &reply); if (r < 0) return r; @@ -2762,15 +2695,16 @@ static enum action verb_to_action(const char *verb) { } static int start_unit(sd_bus *bus, char **args) { - _cleanup_set_free_free_ Set *s = NULL; - _cleanup_strv_free_ char **names = NULL; + _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; const char *method, *mode, *one_name, *suffix = NULL; + _cleanup_strv_free_ char **names = NULL; char **name; int r = 0; assert(bus); ask_password_agent_open_if_enabled(); + polkit_agent_open_if_enabled(); if (arg_action == ACTION_SYSTEMCTL) { enum action action; @@ -2803,20 +2737,16 @@ static int start_unit(sd_bus *bus, char **args) { } if (!arg_no_block) { - r = enable_wait_for_jobs(bus); + r = bus_wait_for_jobs_new(bus, &w); if (r < 0) return log_error_errno(r, "Could not watch jobs: %m"); - - s = set_new(&string_hash_ops); - if (!s) - return log_oom(); } STRV_FOREACH(name, names) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int q; - q = start_unit_one(bus, method, *name, mode, &error, s); + q = start_unit_one(bus, method, *name, mode, &error, w); if (r >= 0 && q < 0) r = translate_bus_error_to_exit_status(q, &error); } @@ -2824,7 +2754,7 @@ static int start_unit(sd_bus *bus, char **args) { if (!arg_no_block) { int q; - q = wait_for_jobs(bus, s); + q = bus_wait_for_jobs(w, arg_quiet); if (q < 0) return q; @@ -3044,7 +2974,7 @@ static int start_special(sd_bus *bus, char **args) { a == ACTION_HIBERNATE || a == ACTION_HYBRID_SLEEP)) { r = reboot_with_logind(bus, a); - if (r >= 0) + if (r >= 0 || IN_SET(r, -ENOTSUP, -EINPROGRESS)) return r; } @@ -3098,6 +3028,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"; @@ -3221,6 +3153,7 @@ typedef struct UnitStatusInfo { const char *active_state; const char *sub_state; const char *unit_file_state; + const char *unit_file_preset; const char *description; const char *following; @@ -3301,12 +3234,6 @@ static void print_status_info( char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; const char *path; - int flags = - arg_all * OUTPUT_SHOW_ALL | - (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | - on_tty() * OUTPUT_COLOR | - !arg_quiet * OUTPUT_WARN_CUTOFF | - arg_full * OUTPUT_FULL_WIDTH; char **t, **t2; assert(i); @@ -3344,7 +3271,10 @@ static void print_status_info( if (i->load_error) printf(" Loaded: %s%s%s (Reason: %s)\n", on, strna(i->load_state), off, i->load_error); - else if (path && i->unit_file_state) + else if (path && !isempty(i->unit_file_state) && !isempty(i->unit_file_preset)) + printf(" Loaded: %s%s%s (%s; %s; vendor preset: %s)\n", + on, strna(i->load_state), off, path, i->unit_file_state, i->unit_file_preset); + else if (path && !isempty(i->unit_file_state)) printf(" Loaded: %s%s%s (%s; %s)\n", on, strna(i->load_state), off, path, i->unit_file_state); else if (path) @@ -3551,12 +3481,12 @@ static void print_status_info( if (i->control_group && (i->main_pid > 0 || i->control_pid > 0 || - ((arg_transport != BUS_TRANSPORT_LOCAL && arg_transport != BUS_TRANSPORT_CONTAINER) || cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, i->control_group, false) == 0))) { + ((arg_transport != BUS_TRANSPORT_LOCAL && arg_transport != BUS_TRANSPORT_MACHINE) || cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, i->control_group, false) == 0))) { unsigned c; printf(" CGroup: %s\n", i->control_group); - if (arg_transport == BUS_TRANSPORT_LOCAL || arg_transport == BUS_TRANSPORT_CONTAINER) { + if (arg_transport == BUS_TRANSPORT_LOCAL || arg_transport == BUS_TRANSPORT_MACHINE) { unsigned k = 0; pid_t extra[2]; static const char prefix[] = " "; @@ -3573,28 +3503,27 @@ static void print_status_info( if (i->control_pid > 0) extra[k++] = i->control_pid; - show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, i->control_group, prefix, c, false, extra, k, flags); + show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, i->control_group, prefix, c, false, extra, k, get_output_flags()); } } if (i->id && arg_transport == BUS_TRANSPORT_LOCAL) { - show_journal_by_unit(stdout, - i->id, - arg_output, - 0, - i->inactive_exit_timestamp_monotonic, - arg_lines, - getuid(), - flags | OUTPUT_BEGIN_NEWLINE, - arg_scope == UNIT_FILE_SYSTEM, - ellipsized); + show_journal_by_unit( + stdout, + i->id, + arg_output, + 0, + i->inactive_exit_timestamp_monotonic, + arg_lines, + getuid(), + get_output_flags() | OUTPUT_BEGIN_NEWLINE, + SD_JOURNAL_LOCAL_ONLY, + arg_scope == UNIT_FILE_SYSTEM, + ellipsized); } if (i->need_daemon_reload) - printf("\n%sWarning:%s Unit file changed on disk, 'systemctl %sdaemon-reload' recommended.\n", - ansi_highlight_red(), - ansi_highlight_off(), - arg_scope == UNIT_FILE_SYSTEM ? "" : "--user "); + warn_unit_file_changed(i->id); } static void show_unit_help(UnitStatusInfo *i) { @@ -3669,6 +3598,8 @@ static int status_property(const char *name, sd_bus_message *m, UnitStatusInfo * i->following = s; else if (streq(name, "UnitFileState")) i->unit_file_state = s; + else if (streq(name, "UnitFilePreset")) + i->unit_file_preset = s; else if (streq(name, "Result")) i->result = s; } @@ -4451,14 +4382,7 @@ static int show_system_status(sd_bus *bus) { format_timestamp_relative(since1, sizeof(since1), mi.timestamp)); printf(" CGroup: %s\n", mi.control_group ?: "/"); - if (arg_transport == BUS_TRANSPORT_LOCAL || arg_transport == BUS_TRANSPORT_CONTAINER) { - int flags = - arg_all * OUTPUT_SHOW_ALL | - (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | - on_tty() * OUTPUT_COLOR | - !arg_quiet * OUTPUT_WARN_CUTOFF | - arg_full * OUTPUT_FULL_WIDTH; - + if (arg_transport == BUS_TRANSPORT_LOCAL || arg_transport == BUS_TRANSPORT_MACHINE) { static const char prefix[] = " "; unsigned c; @@ -4468,7 +4392,7 @@ static int show_system_status(sd_bus *bus) { else c = 0; - show_cgroup(SYSTEMD_CGROUP_CONTROLLER, strempty(mi.control_group), prefix, c, false, flags); + show_cgroup(SYSTEMD_CGROUP_CONTROLLER, strempty(mi.control_group), prefix, c, false, get_output_flags()); } free(mi.state); @@ -4569,58 +4493,67 @@ static int show(sd_bus *bus, char **args) { return ret; } +static int init_home_and_lookup_paths(char **user_home, char **user_runtime, LookupPaths *lp) { + int r; + + assert(user_home); + assert(user_runtime); + assert(lp); + + if (arg_scope == UNIT_FILE_USER) { + r = user_config_home(user_home); + if (r < 0) + return log_error_errno(r, "Failed to query XDG_CONFIG_HOME: %m"); + else if (r == 0) + return log_error_errno(ENOTDIR, "Cannot find units: $XDG_CONFIG_HOME and $HOME are not set."); + + r = user_runtime_dir(user_runtime); + if (r < 0) + return log_error_errno(r, "Failed to query XDG_CONFIG_HOME: %m"); + else if (r == 0) + return log_error_errno(ENOTDIR, "Cannot find units: $XDG_RUNTIME_DIR is not set."); + } + + r = lookup_paths_init_from_scope(lp, arg_scope, arg_root); + if (r < 0) + return log_error_errno(r, "Failed to lookup unit lookup paths: %m"); + + return 0; +} + static int cat(sd_bus *bus, char **args) { + _cleanup_free_ char *user_home = NULL; + _cleanup_free_ char *user_runtime = NULL; + _cleanup_lookup_paths_free_ LookupPaths lp = {}; _cleanup_strv_free_ char **names = NULL; char **name; - bool first = true; + bool first = true, avoid_bus_cache; int r = 0; - assert(bus); assert(args); + r = init_home_and_lookup_paths(&user_home, &user_runtime, &lp); + if (r < 0) + return r; + r = expand_names(bus, args + 1, NULL, &names); if (r < 0) log_error_errno(r, "Failed to expand names: %m"); + avoid_bus_cache = !bus || avoid_bus(); + pager_open_if_enabled(); STRV_FOREACH(name, names) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_free_ char *fragment_path = NULL; _cleanup_strv_free_ char **dropin_paths = NULL; - _cleanup_free_ char *fragment_path = NULL, *unit = NULL; char **path; - unit = unit_dbus_path_from_name(*name); - if (!unit) - return log_oom(); - - if (need_daemon_reload(bus, *name) > 0) - log_warning("Unit file of %s changed on disk. Run 'systemctl%s daemon-reload'.", - *name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); - - r = sd_bus_get_property_string( - bus, - "org.freedesktop.systemd1", - unit, - "org.freedesktop.systemd1.Unit", - "FragmentPath", - &error, - &fragment_path); - if (r < 0) { - log_warning("Failed to get FragmentPath: %s", bus_error_message(&error, r)); - continue; - } - - r = sd_bus_get_property_strv( - bus, - "org.freedesktop.systemd1", - unit, - "org.freedesktop.systemd1.Unit", - "DropInPaths", - &error, - &dropin_paths); - if (r < 0) { - log_warning("Failed to get DropInPaths: %s", bus_error_message(&error, r)); + r = unit_find_paths(bus, *name, avoid_bus_cache, &lp, &fragment_path, &dropin_paths); + if (r < 0) + return r; + else if (r == 0) { + log_warning("Unit %s does not have any files on disk", *name); continue; } @@ -4629,14 +4562,14 @@ static int cat(sd_bus *bus, char **args) { else puts(""); - if (!isempty(fragment_path)) { + if (fragment_path) { printf("%s# %s%s\n", ansi_highlight_blue(), fragment_path, ansi_highlight_off()); fflush(stdout); - r = copy_file_fd(fragment_path, STDOUT_FILENO); + r = copy_file_fd(fragment_path, STDOUT_FILENO, false); if (r < 0) { log_warning_errno(r, "Failed to cat %s: %m", fragment_path); continue; @@ -4651,7 +4584,7 @@ static int cat(sd_bus *bus, char **args) { ansi_highlight_off()); fflush(stdout); - r = copy_file_fd(*path, STDOUT_FILENO); + r = copy_file_fd(*path, STDOUT_FILENO, false); if (r < 0) { log_warning_errno(r, "Failed to cat %s: %m", *path); continue; @@ -4669,6 +4602,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, @@ -4729,6 +4664,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 @@ -4791,6 +4728,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"); @@ -4834,6 +4773,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) @@ -4892,6 +4833,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"); @@ -5138,7 +5081,7 @@ static int enable_sysv_units(const char *verb, char **args) { int r = 0; #if defined(HAVE_SYSV_COMPAT) && defined(HAVE_CHKCONFIG) - unsigned f = 1, t = 1; + unsigned f = 0; _cleanup_lookup_paths_free_ LookupPaths paths = {}; if (arg_scope != UNIT_FILE_SYSTEM) @@ -5157,7 +5100,7 @@ static int enable_sysv_units(const char *verb, char **args) { return r; r = 0; - for (f = 0; args[f]; f++) { + while (args[f]) { const char *name; _cleanup_free_ char *p = NULL, *q = NULL, *l = NULL; bool found_native = false, found_sysv; @@ -5168,7 +5111,7 @@ static int enable_sysv_units(const char *verb, char **args) { pid_t pid; siginfo_t status; - name = args[f]; + name = args[f++]; if (!endswith(name, ".service")) continue; @@ -5200,9 +5143,6 @@ static int enable_sysv_units(const char *verb, char **args) { if (!found_sysv) continue; - /* Mark this entry, so that we don't try enabling it as native unit */ - args[f] = (char*) ""; - log_info("%s is not a native service, redirecting to /sbin/chkconfig.", name); if (!isempty(arg_root)) @@ -5251,19 +5191,14 @@ static int enable_sysv_units(const char *verb, char **args) { return -EINVAL; } else return -EPROTO; - } - - /* Drop all SysV units */ - for (f = 0, t = 0; args[f]; f++) { - if (isempty(args[f])) - continue; - - args[t++] = args[f]; + /* Remove this entry, so that we don't try enabling it as native unit */ + assert(f > 0); + f--; + assert(args[f] == name); + strv_remove(args, name); } - args[t] = NULL; - #endif return r; } @@ -5361,6 +5296,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; @@ -5435,7 +5372,7 @@ static int enable_unit(sd_bus *bus, char **args) { return bus_log_parse_error(r); } - r = deserialize_and_dump_unit_file_changes(reply); + r = bus_deserialize_and_dump_unit_file_changes(reply, arg_quiet); if (r < 0) return r; @@ -5506,6 +5443,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, @@ -5534,7 +5473,7 @@ static int add_dependency(sd_bus *bus, char **args) { return r; } - r = deserialize_and_dump_unit_file_changes(reply); + r = bus_deserialize_and_dump_unit_file_changes(reply, arg_quiet); if (r < 0) return r; @@ -5569,6 +5508,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, @@ -5598,7 +5539,7 @@ static int preset_all(sd_bus *bus, char **args) { return r; } - r = deserialize_and_dump_unit_file_changes(reply); + r = bus_deserialize_and_dump_unit_file_changes(reply, arg_quiet); if (r < 0) return r; @@ -5709,47 +5650,24 @@ static int is_system_running(sd_bus *bus, char **args) { return streq(state, "running") ? EXIT_SUCCESS : EXIT_FAILURE; } -static int unit_file_find_path(LookupPaths *lp, const char *unit_name, char **unit_path) { - char **p; - - assert(lp); - assert(unit_name); - assert(unit_path); - - STRV_FOREACH(p, lp->unit_path) { - char *path; - - path = path_join(arg_root, *p, unit_name); - if (!path) - return log_oom(); - - if (access(path, F_OK) == 0) { - *unit_path = path; - return 1; - } - - free(path); - } - - return 0; -} - static int create_edit_temp_file(const char *new_path, const char *original_path, char **ret_tmp_fn) { - _cleanup_close_ int fd = -1; - int r; char *t; + int r; assert(new_path); assert(original_path); assert(ret_tmp_fn); - t = tempfn_random(new_path); - if (!t) - return log_oom(); + r = tempfn_random(new_path, &t); + if (r < 0) + return log_error_errno(r, "Failed to determine temporary filename for %s: %m", new_path); r = mkdir_parents(new_path, 0755); - if (r < 0) - return log_error_errno(r, "Failed to create directories for %s: %m", new_path); + if (r < 0) { + log_error_errno(r, "Failed to create directories for %s: %m", new_path); + free(t); + return r; + } r = copy_file(original_path, t, 0, 0644); if (r == -ENOENT) { @@ -5770,41 +5688,58 @@ static int create_edit_temp_file(const char *new_path, const char *original_path return 0; } -static int get_drop_in_to_edit(const char *unit_name, const char *user_home, const char *user_runtime, char **ret_path) { - char *tmp_new_path; - char *tmp; - - assert(unit_name); - assert(ret_path); +static int get_file_to_edit(const char *name, const char *user_home, const char *user_runtime, char **ret_path) { + _cleanup_free_ char *path = NULL, *path2 = NULL, *run = NULL; switch (arg_scope) { case UNIT_FILE_SYSTEM: - tmp = strappenda(arg_runtime ? "/run/systemd/system/" : SYSTEM_CONFIG_UNIT_PATH "/", unit_name, ".d/override.conf"); + path = path_join(arg_root, SYSTEM_CONFIG_UNIT_PATH, name); + if (arg_runtime) + run = path_join(arg_root, "/run/systemd/system/", name); break; case UNIT_FILE_GLOBAL: - tmp = strappenda(arg_runtime ? "/run/systemd/user/" : USER_CONFIG_UNIT_PATH "/", unit_name, ".d/override.conf"); + path = path_join(arg_root, USER_CONFIG_UNIT_PATH, name); + if (arg_runtime) + run = path_join(arg_root, "/run/systemd/user/", name); break; case UNIT_FILE_USER: assert(user_home); assert(user_runtime); - tmp = strappenda(arg_runtime ? user_runtime : user_home, "/", unit_name, ".d/override.conf"); + path = path_join(arg_root, user_home, name); + if (arg_runtime) { + path2 = path_join(arg_root, USER_CONFIG_UNIT_PATH, name); + if (!path2) + return log_oom(); + run = path_join(arg_root, user_runtime, name); + } break; default: assert_not_reached("Invalid scope"); } - - tmp_new_path = path_join(arg_root, tmp, NULL); - if (!tmp_new_path) + if (!path || (arg_runtime && !run)) return log_oom(); - *ret_path = tmp_new_path; + if (arg_runtime) { + if (access(path, F_OK) >= 0) + return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.", + run, path); + if (path2 && access(path2, F_OK) >= 0) + return log_error_errno(EEXIST, "Refusing to create \"%s\" because it would be overriden by \"%s\" anyway.", + run, path2); + *ret_path = run; + run = NULL; + } else { + *ret_path = path; + path = NULL; + } return 0; } -static int unit_file_create_drop_in(const char *unit_name, const char *user_home, const char *user_runtime, char **ret_new_path, char **ret_tmp_path) { - char *tmp_new_path; + +static int unit_file_create_dropin(const char *unit_name, const char *user_home, const char *user_runtime, char **ret_new_path, char **ret_tmp_path) { + char *tmp_new_path, *ending; char *tmp_tmp_path; int r; @@ -5812,7 +5747,8 @@ static int unit_file_create_drop_in(const char *unit_name, const char *user_home assert(ret_new_path); assert(ret_tmp_path); - r = get_drop_in_to_edit(unit_name, user_home, user_runtime, &tmp_new_path); + ending = strappenda(unit_name, ".d/override.conf"); + r = get_file_to_edit(ending, user_home, user_runtime, &tmp_new_path); if (r < 0) return r; @@ -5828,91 +5764,6 @@ static int unit_file_create_drop_in(const char *unit_name, const char *user_home return 0; } -static bool unit_is_editable(const char *unit_name, const char *fragment_path, const char *user_home) { - bool editable = true; - const char *invalid_path; - - assert(unit_name); - - if (!arg_runtime) - return true; - - switch (arg_scope) { - case UNIT_FILE_SYSTEM: - if (path_startswith(fragment_path, "/etc/systemd/system")) { - editable = false; - invalid_path = "/etc/systemd/system"; - } else if (path_startswith(fragment_path, SYSTEM_CONFIG_UNIT_PATH)) { - editable = false; - invalid_path = SYSTEM_CONFIG_UNIT_PATH; - } - break; - case UNIT_FILE_GLOBAL: - if (path_startswith(fragment_path, "/etc/systemd/user")) { - editable = false; - invalid_path = "/etc/systemd/user"; - } else if (path_startswith(fragment_path, USER_CONFIG_UNIT_PATH)) { - editable = false; - invalid_path = USER_CONFIG_UNIT_PATH; - } - break; - case UNIT_FILE_USER: - assert(user_home); - - if (path_startswith(fragment_path, "/etc/systemd/user")) { - editable = false; - invalid_path = "/etc/systemd/user"; - } else if (path_startswith(fragment_path, USER_CONFIG_UNIT_PATH)) { - editable = false; - invalid_path = USER_CONFIG_UNIT_PATH; - } else if (path_startswith(fragment_path, user_home)) { - editable = false; - invalid_path = user_home; - } - break; - default: - assert_not_reached("Invalid scope"); - } - - if (!editable) - log_error("%s ignored: cannot temporarily edit units from %s", unit_name, invalid_path); - - return editable; -} - -static int get_copy_to_edit(const char *unit_name, const char *fragment_path, const char *user_home, const char *user_runtime, char **ret_path) { - char *tmp_new_path; - - assert(unit_name); - assert(ret_path); - - if (!unit_is_editable(unit_name, fragment_path, user_home)) - return -EINVAL; - - switch (arg_scope) { - case UNIT_FILE_SYSTEM: - tmp_new_path = path_join(arg_root, arg_runtime ? "/run/systemd/system/" : SYSTEM_CONFIG_UNIT_PATH, unit_name); - break; - case UNIT_FILE_GLOBAL: - tmp_new_path = path_join(arg_root, arg_runtime ? "/run/systemd/user/" : USER_CONFIG_UNIT_PATH, unit_name); - break; - case UNIT_FILE_USER: - assert(user_home); - assert(user_runtime); - - tmp_new_path = path_join(arg_root, arg_runtime ? user_runtime : user_home, unit_name); - break; - default: - assert_not_reached("Invalid scope"); - } - if (!tmp_new_path) - return log_oom(); - - *ret_path = tmp_new_path; - - return 0; -} - static int unit_file_create_copy(const char *unit_name, const char *fragment_path, const char *user_home, @@ -5928,7 +5779,7 @@ static int unit_file_create_copy(const char *unit_name, assert(ret_new_path); assert(ret_tmp_path); - r = get_copy_to_edit(unit_name, fragment_path, user_home, user_runtime, &tmp_new_path); + r = get_file_to_edit(unit_name, user_home, user_runtime, &tmp_new_path); if (r < 0) return r; @@ -6018,7 +5869,7 @@ static int run_editor(char **paths) { } } - log_error("Cannot edit unit(s): No editor available. Please set either SYSTEMD_EDITOR or EDITOR or VISUAL environment variable"); + log_error("Cannot edit unit(s), no editor available. Please set either $SYSTEMD_EDITOR or $EDITOR or $VISUAL."); _exit(EXIT_FAILURE); } @@ -6032,124 +5883,41 @@ static int run_editor(char **paths) { static int find_paths_to_edit(sd_bus *bus, char **names, char ***paths) { _cleanup_free_ char *user_home = NULL; _cleanup_free_ char *user_runtime = NULL; + _cleanup_lookup_paths_free_ LookupPaths lp = {}; + bool avoid_bus_cache; char **name; int r; assert(names); assert(paths); - if (arg_scope == UNIT_FILE_USER) { - r = user_config_home(&user_home); - if (r < 0) - return log_oom(); - else if (r == 0) { - log_error("Cannot edit units for the user instance: home directory unknown"); - return -1; - } + r = init_home_and_lookup_paths(&user_home, &user_runtime, &lp); + if (r < 0) + return r; - r = user_runtime_dir(&user_runtime); - if (r < 0) - return log_oom(); - else if (r == 0) { - log_error("Cannot edit units for the user instance: runtime directory unknown"); - return -1; - } - } + avoid_bus_cache = !bus || avoid_bus(); - if (!bus || avoid_bus()) { - _cleanup_lookup_paths_free_ LookupPaths lp = {}; + STRV_FOREACH(name, names) { + _cleanup_free_ char *path = NULL; + char *new_path, *tmp_path; - /* If there is no bus, we try to find the units by testing each available directory - * according to the scope. - */ - r = lookup_paths_init(&lp, - arg_scope == UNIT_FILE_SYSTEM ? SYSTEMD_SYSTEM : SYSTEMD_USER, - arg_scope == UNIT_FILE_USER, - arg_root, - NULL, NULL, NULL); - if (r < 0) { - log_error_errno(r, "Failed get lookup paths: %m"); + r = unit_find_paths(bus, *name, avoid_bus_cache, &lp, &path, NULL); + if (r < 0) return r; - } - - STRV_FOREACH(name, names) { - _cleanup_free_ char *path = NULL; - char *new_path, *tmp_path; - - r = unit_file_find_path(&lp, *name, &path); - if (r < 0) - return r; - if (r == 0) { - log_warning("%s ignored: not found", *name); - continue; - } - - if (arg_full) - r = unit_file_create_copy(*name, path, user_home, user_runtime, &new_path, &tmp_path); - else - r = unit_file_create_drop_in(*name, user_home, user_runtime, &new_path, &tmp_path); - - if (r < 0) - continue; - - r = strv_push(paths, new_path); - if (r < 0) - return log_oom(); - - r = strv_push(paths, tmp_path); - if (r < 0) - return log_oom(); - } - } else { - STRV_FOREACH(name, names) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_free_ char *fragment_path = NULL; - _cleanup_free_ char *unit = NULL; - char *new_path, *tmp_path; - - unit = unit_dbus_path_from_name(*name); - if (!unit) - return log_oom(); - - if (need_daemon_reload(bus, *name) > 0) { - log_warning("%s ignored: unit file changed on disk. Run 'systemctl%s daemon-reload'.", - *name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); - continue; - } - - r = sd_bus_get_property_string( - bus, - "org.freedesktop.systemd1", - unit, - "org.freedesktop.systemd1.Unit", - "FragmentPath", - &error, - &fragment_path); - if (r < 0) { - log_warning("Failed to get FragmentPath: %s", bus_error_message(&error, r)); - continue; - } + else if (r == 0 || !path) + // FIXME: support units with path==NULL (no FragmentPath) + return log_error_errno(ENOENT, "Unit %s not found, cannot edit.", *name); - if (isempty(fragment_path)) { - log_warning("%s ignored: not found", *name); - continue; - } - - if (arg_full) - r = unit_file_create_copy(*name, fragment_path, user_home, user_runtime, &new_path, &tmp_path); - else - r = unit_file_create_drop_in(*name, user_home, user_runtime, &new_path, &tmp_path); - if (r < 0) - continue; - - r = strv_push(paths, new_path); - if (r < 0) - return log_oom(); + if (arg_full) + r = unit_file_create_copy(*name, path, user_home, user_runtime, &new_path, &tmp_path); + else + r = unit_file_create_dropin(*name, user_home, user_runtime, &new_path, &tmp_path); + if (r < 0) + return r; - r = strv_push(paths, tmp_path); - if (r < 0) - return log_oom(); - } + r = strv_push_pair(paths, new_path, tmp_path); + if (r < 0) + return log_oom(); } return 0; @@ -6307,7 +6075,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" @@ -6316,10 +6084,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" @@ -6700,7 +6467,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) { break; case 'M': - arg_transport = BUS_TRANSPORT_CONTAINER; + arg_transport = BUS_TRANSPORT_MACHINE; arg_host = optarg; break; @@ -6944,7 +6711,7 @@ static int shutdown_parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "HPrhkt:afFc", options, NULL)) >= 0) + while ((c = getopt_long(argc, argv, "HPrhkKt:afFc", options, NULL)) >= 0) switch (c) { case ARG_HELP: @@ -6985,6 +6752,8 @@ static int shutdown_parse_argv(int argc, char *argv[]) { case 't': case 'a': + case 'f': + case 'F': /* Compatibility nops */ break; @@ -7239,12 +7008,9 @@ static int talk_initctl(void) { return -errno; } - errno = 0; - r = loop_write(fd, &request, sizeof(request), false) != sizeof(request); - if (r) { - log_error_errno(errno, "Failed to write to "INIT_FIFO": %m"); - return errno > 0 ? -errno : -EIO; - } + r = loop_write(fd, &request, sizeof(request), false); + if (r < 0) + return log_error_errno(r, "Failed to write to "INIT_FIFO": %m"); return 1; } @@ -7290,7 +7056,7 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { { "check", MORE, 2, check_unit_active }, { "is-failed", MORE, 2, check_unit_failed }, { "show", MORE, 1, show }, - { "cat", MORE, 2, cat }, + { "cat", MORE, 2, cat, NOBUS }, { "status", MORE, 1, show }, { "help", MORE, 2, show }, { "snapshot", LESS, 2, snapshot }, @@ -7657,6 +7423,11 @@ int main(int argc, char*argv[]) { goto finish; } + /* Increase max number of open files to 16K if we can, we + * might needs this when browsing journal files, which might + * be split up into many files. */ + setrlimit_closest(RLIMIT_NOFILE, &RLIMIT_MAKE_CONST(16384)); + if (!avoid_bus()) r = bus_open_transport_systemd(arg_transport, arg_host, arg_scope != UNIT_FILE_SYSTEM, &bus);