diff options
| -rw-r--r-- | src/systemctl/systemctl-add-dependency.c | 9 | ||||
| -rw-r--r-- | src/systemctl/systemctl-enable.c | 8 | ||||
| -rw-r--r-- | src/systemctl/systemctl-preset-all.c | 9 | ||||
| -rw-r--r-- | src/systemctl/systemctl-set-default.c | 9 |
4 files changed, 19 insertions, 16 deletions
diff --git a/src/systemctl/systemctl-add-dependency.c b/src/systemctl/systemctl-add-dependency.c index aa3844f4d4..8df25b515d 100644 --- a/src/systemctl/systemctl-add-dependency.c +++ b/src/systemctl/systemctl-add-dependency.c @@ -11,13 +11,9 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) { _cleanup_strv_free_ char **names = NULL; _cleanup_free_ char *target = NULL; const char *verb = argv[0]; - InstallChange *changes = NULL; - size_t n_changes = 0; UnitDependency dep; int r; - CLEANUP_ARRAY(changes, n_changes, install_changes_free); - if (!argv[1]) return 0; @@ -39,6 +35,11 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) { assert_not_reached(); if (install_client_side()) { + InstallChange *changes = NULL; + size_t n_changes = 0; + + CLEANUP_ARRAY(changes, n_changes, install_changes_free); + r = unit_file_add_dependency(arg_runtime_scope, unit_file_flags_from_args(), arg_root, names, target, dep, &changes, &n_changes); install_changes_dump(r, "add dependency on", changes, n_changes, arg_quiet); if (r < 0) diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c index 98bf30670d..6d3709705e 100644 --- a/src/systemctl/systemctl-enable.c +++ b/src/systemctl/systemctl-enable.c @@ -64,14 +64,10 @@ static int normalize_names(char **names) { int verb_enable(int argc, char *argv[], void *userdata) { _cleanup_strv_free_ char **names = NULL; const char *verb = argv[0]; - InstallChange *changes = NULL; - size_t n_changes = 0; int carries_install_info = -1; bool ignore_carries_install_info = arg_quiet || arg_no_warn; int r; - CLEANUP_ARRAY(changes, n_changes, install_changes_free); - if (!argv[1]) return 0; @@ -106,6 +102,10 @@ int verb_enable(int argc, char *argv[], void *userdata) { if (install_client_side()) { UnitFileFlags flags; + InstallChange *changes = NULL; + size_t n_changes = 0; + + CLEANUP_ARRAY(changes, n_changes, install_changes_free); flags = unit_file_flags_from_args(); if (streq(verb, "enable")) { diff --git a/src/systemctl/systemctl-preset-all.c b/src/systemctl/systemctl-preset-all.c index 5d73172988..b55f8e35ca 100644 --- a/src/systemctl/systemctl-preset-all.c +++ b/src/systemctl/systemctl-preset-all.c @@ -8,13 +8,14 @@ #include "systemctl.h" int verb_preset_all(int argc, char *argv[], void *userdata) { - InstallChange *changes = NULL; - size_t n_changes = 0; int r; - CLEANUP_ARRAY(changes, n_changes, install_changes_free); - if (install_client_side()) { + InstallChange *changes = NULL; + size_t n_changes = 0; + + CLEANUP_ARRAY(changes, n_changes, install_changes_free); + r = unit_file_preset_all(arg_runtime_scope, unit_file_flags_from_args(), arg_root, arg_preset_mode, &changes, &n_changes); install_changes_dump(r, "preset", changes, n_changes, arg_quiet); diff --git a/src/systemctl/systemctl-set-default.c b/src/systemctl/systemctl-set-default.c index 3b161d7cba..136a4f3b66 100644 --- a/src/systemctl/systemctl-set-default.c +++ b/src/systemctl/systemctl-set-default.c @@ -95,15 +95,11 @@ int verb_get_default(int argc, char *argv[], void *userdata) { int verb_set_default(int argc, char *argv[], void *userdata) { _cleanup_free_ char *unit = NULL; - InstallChange *changes = NULL; - size_t n_changes = 0; int r; assert(argc >= 2); assert(argv); - CLEANUP_ARRAY(changes, n_changes, install_changes_free); - r = unit_name_mangle_with_suffix(argv[1], "set-default", arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN, ".target", &unit); @@ -111,6 +107,11 @@ int verb_set_default(int argc, char *argv[], void *userdata) { return log_error_errno(r, "Failed to mangle unit name: %m"); if (install_client_side()) { + InstallChange *changes = NULL; + size_t n_changes = 0; + + CLEANUP_ARRAY(changes, n_changes, install_changes_free); + r = unit_file_set_default(arg_runtime_scope, UNIT_FILE_FORCE, arg_root, unit, &changes, &n_changes); install_changes_dump(r, "set default", changes, n_changes, arg_quiet); if (r < 0) |