X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl%2Fsystemctl.c;h=d1b7f8ad7bb04e6d9d66caa1159e9107211343f3;hp=083b6180e394d8a755a0b1688900ee3095ce4cd2;hb=8744505aaefad761cba0f0e5afaaf6bcec53906e;hpb=b5e6a600327d4e92c9fe62b9d51648a9d459871e diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 083b6180e..d1b7f8ad7 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2293,6 +2293,9 @@ static int unit_find_paths(sd_bus *bus, LookupPaths *lp, char **fragment_path, char ***dropin_paths) { + + _cleanup_free_ char *path = NULL; + _cleanup_strv_free_ char **dropins = NULL; int r; /** @@ -2311,9 +2314,6 @@ static int unit_find_paths(sd_bus *bus, _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *unit_load_error = NULL; _cleanup_free_ char *unit = NULL; - _cleanup_free_ char *path = NULL; - _cleanup_strv_free_ char **dropins = NULL; - _cleanup_strv_free_ char **load_error = NULL; char *unit_load_error_name, *unit_load_error_message; unit = unit_dbus_path_from_name(unit_name); @@ -2359,28 +2359,17 @@ static int unit_find_paths(sd_bus *bus, if (r < 0) return log_error_errno(r, "Failed to get FragmentPath: %s", bus_error_message(&error, r)); - 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)); - - r = 0; - if (!isempty(path)) { - *fragment_path = path; - path = NULL; - r = 1; - } - - if (dropin_paths && !strv_isempty(dropins)) { - *dropin_paths = dropins; - dropins = NULL; - r = 1; + if (dropin_paths) { + 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)); } } else { _cleanup_set_free_ Set *names; @@ -2393,7 +2382,7 @@ static int unit_find_paths(sd_bus *bus, if (r < 0) return r; - r = unit_file_find_path(lp, unit_name, fragment_path); + r = unit_file_find_path(lp, unit_name, &path); if (r < 0) return r; @@ -2405,14 +2394,31 @@ static int unit_find_paths(sd_bus *bus, return log_oom(); if (!streq(template, unit_name)) { - r = unit_file_find_path(lp, template, fragment_path); + r = unit_file_find_path(lp, template, &path); if (r < 0) return r; } } - if (dropin_paths) - r = unit_file_find_dropin_paths(lp->unit_path, NULL, names, dropin_paths); + if (dropin_paths) { + r = unit_file_find_dropin_paths(lp->unit_path, NULL, names, &dropins); + if (r < 0) + return r; + } + } + + r = 0; + + if (!isempty(path)) { + *fragment_path = path; + path = NULL; + r = 1; + } + + if (dropin_paths && !strv_isempty(dropins)) { + *dropin_paths = dropins; + dropins = NULL; + r = 1; } if (r == 0) @@ -2986,7 +2992,7 @@ static int start_special(sd_bus *bus, char **args) { return -EPERM; } - if (a == ACTION_REBOOT) { + if (a == ACTION_REBOOT && args[1]) { r = update_reboot_param_file(args[1]); if (r < 0) return r; @@ -4578,7 +4584,7 @@ static int init_home_and_lookup_paths(char **user_home, char **user_runtime, Loo 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 log_error_errno(r, "Failed to query unit lookup paths: %m"); return 0; } @@ -4594,8 +4600,8 @@ static int cat(sd_bus *bus, char **args) { assert(args); - if (arg_host) { - log_error("Option --host cannot be used with 'cat'"); + if (arg_transport != BUS_TRANSPORT_LOCAL) { + log_error("Cannot remotely cat units"); return -EINVAL; } @@ -4605,7 +4611,7 @@ static int cat(sd_bus *bus, char **args) { r = expand_names(bus, args + 1, NULL, &names); if (r < 0) - log_error_errno(r, "Failed to expand names: %m"); + return log_error_errno(r, "Failed to expand names: %m"); avoid_bus_cache = !bus || avoid_bus(); @@ -5725,11 +5731,11 @@ static int create_edit_temp_file(const char *new_path, const char *original_path r = tempfn_random(new_path, &t); if (r < 0) - return log_error_errno(r, "Failed to determine temporary filename for %s: %m", new_path); + return log_error_errno(r, "Failed to determine temporary filename for \"%s\": %m", new_path); r = mkdir_parents(new_path, 0755); if (r < 0) { - log_error_errno(r, "Failed to create directories for %s: %m", new_path); + log_error_errno(r, "Failed to create directories for \"%s\": %m", new_path); free(t); return r; } @@ -5738,12 +5744,12 @@ static int create_edit_temp_file(const char *new_path, const char *original_path if (r == -ENOENT) { r = touch(t); if (r < 0) { - log_error_errno(r, "Failed to create temporary file %s: %m", t); + log_error_errno(r, "Failed to create temporary file \"%s\": %m", t); free(t); return r; } } else if (r < 0) { - log_error_errno(r, "Failed to copy %s to %s: %m", original_path, t); + log_error_errno(r, "Failed to copy \"%s\" to \"%s\": %m", original_path, t); free(t); return r; } @@ -5851,7 +5857,7 @@ static int unit_file_create_copy(const char *unit_name, if (!path_equal(fragment_path, tmp_new_path) && access(tmp_new_path, F_OK) == 0) { char response; - r = ask_char(&response, "yn", "%s already exists, are you sure to overwrite it with %s? [(y)es, (n)o] ", tmp_new_path, fragment_path); + r = ask_char(&response, "yn", "\"%s\" already exists. Overwrite with \"%s\"? [(y)es, (n)o] ", tmp_new_path, fragment_path); if (r < 0) { free(tmp_new_path); return r; @@ -5865,7 +5871,7 @@ static int unit_file_create_copy(const char *unit_name, r = create_edit_temp_file(tmp_new_path, fragment_path, &tmp_tmp_path); if (r < 0) { - log_error_errno(r, "Failed to create temporary file for %s: %m", tmp_new_path); + log_error_errno(r, "Failed to create temporary file for \"%s\": %m", tmp_new_path); free(tmp_new_path); return r; } @@ -6001,7 +6007,7 @@ static int edit(sd_bus *bus, char **args) { assert(args); if (!on_tty()) { - log_error("Cannot edit units if we are not on a tty"); + log_error("Cannot edit units if not on a tty"); return -EINVAL; } @@ -6030,12 +6036,12 @@ static int edit(sd_bus *bus, char **args) { * It's useful if the user wants to cancel its modification */ if (null_or_empty_path(*tmp)) { - log_warning("Edition of %s canceled: temporary file empty", *original); + log_warning("Editing \"%s\" canceled: temporary file is empty", *original); continue; } r = rename(*tmp, *original); if (r < 0) { - r = log_error_errno(errno, "Failed to rename %s to %s: %m", *tmp, *original); + r = log_error_errno(errno, "Failed to rename \"%s\" to \"%s\": %m", *tmp, *original); goto end; } }