mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 20:25:38 +03:00
Merge pull request #3336 from eworm-de/systemctl-set-default
systemctl: return success for set-default, add-wants, add-requires...
This commit is contained in:
commit
6f79340136
@ -1439,6 +1439,8 @@ static int list_unit_files(int argc, char *argv[], void *userdata) {
|
||||
|
||||
assert(c <= n_units);
|
||||
hashmap_free(h);
|
||||
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
@ -2025,6 +2027,7 @@ static int get_default(int argc, char *argv[], void *userdata) {
|
||||
return log_error_errno(r, "Failed to get default target: %m");
|
||||
path = _path;
|
||||
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
sd_bus *bus;
|
||||
@ -2072,6 +2075,9 @@ static int set_default(int argc, char *argv[], void *userdata) {
|
||||
if (install_client_side()) {
|
||||
r = unit_file_set_default(arg_scope, arg_root, unit, true, &changes, &n_changes);
|
||||
unit_file_dump_changes(r, "set default", changes, n_changes, arg_quiet);
|
||||
|
||||
if (r > 0)
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
|
||||
@ -5539,7 +5545,7 @@ static int enable_unit(int argc, char *argv[], void *userdata) {
|
||||
|
||||
unit_file_dump_changes(r, verb, changes, n_changes, arg_quiet);
|
||||
if (r < 0)
|
||||
return r;
|
||||
goto finish;
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL, *m = NULL;
|
||||
@ -5631,7 +5637,7 @@ static int enable_unit(int argc, char *argv[], void *userdata) {
|
||||
|
||||
r = bus_deserialize_and_dump_unit_file_changes(reply, arg_quiet, &changes, &n_changes);
|
||||
if (r < 0)
|
||||
return r;
|
||||
goto finish;
|
||||
|
||||
/* Try to reload if enabled */
|
||||
if (!arg_no_reload)
|
||||
@ -5707,6 +5713,9 @@ static int add_dependency(int argc, char *argv[], void *userdata) {
|
||||
if (install_client_side()) {
|
||||
r = unit_file_add_dependency(arg_scope, arg_runtime, arg_root, names, target, dep, arg_force, &changes, &n_changes);
|
||||
unit_file_dump_changes(r, "add dependency on", changes, n_changes, arg_quiet);
|
||||
|
||||
if (r > 0)
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL, *m = NULL;
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
@ -5766,6 +5775,9 @@ static int preset_all(int argc, char *argv[], void *userdata) {
|
||||
if (install_client_side()) {
|
||||
r = unit_file_preset_all(arg_scope, arg_runtime, arg_root, arg_preset_mode, arg_force, &changes, &n_changes);
|
||||
unit_file_dump_changes(r, "preset", changes, n_changes, arg_quiet);
|
||||
|
||||
if (r > 0)
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
|
||||
@ -5848,6 +5860,7 @@ static int unit_is_enabled(int argc, char *argv[], void *userdata) {
|
||||
puts(unit_file_state_to_string(state));
|
||||
}
|
||||
|
||||
r = 0;
|
||||
} else {
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
sd_bus *bus;
|
||||
@ -7497,7 +7510,7 @@ static int systemctl_main(int argc, char *argv[]) {
|
||||
{ "switch-root", 2, VERB_ANY, VERB_NOCHROOT, switch_root },
|
||||
{ "list-dependencies", VERB_ANY, 2, VERB_NOCHROOT, list_dependencies },
|
||||
{ "set-default", 2, 2, 0, set_default },
|
||||
{ "get-default", VERB_ANY, 1, 0, get_default, },
|
||||
{ "get-default", VERB_ANY, 1, 0, get_default },
|
||||
{ "set-property", 3, VERB_ANY, VERB_NOCHROOT, set_property },
|
||||
{ "is-system-running", VERB_ANY, 1, 0, is_system_running },
|
||||
{ "add-wants", 3, VERB_ANY, 0, add_dependency },
|
||||
|
Loading…
Reference in New Issue
Block a user