diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-07-28 12:57:10 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-08-06 16:42:23 +0200 |
commit | fd310092c1aa26344ba959e6902b167b961e8fe4 (patch) | |
tree | 247a914a93c4917d9f48de36058933ea73ed833f | |
parent | 8ed8680cc21f010c03287a84a2a7bd54b94826ff (diff) | |
download | systemd-fd310092c1aa26344ba959e6902b167b961e8fe4.tar.gz |
systemctl: allow set-property to be called with a glob pattern
We call "systemctl set-property … Markers=+needs-restart" and this should
also work for globs, e.g. "user@*.service" or "syncthing@*.service".
https://bugzilla.redhat.com/show_bug.cgi?id=1986258
(cherry picked from commit 23a0ffa59f9cb26c4b016c9fd1a3a70da2607f61)
(cherry picked from commit d334cc62101b8b8ea37d8458f90abc5a6136b315)
-rw-r--r-- | src/systemctl/systemctl-set-property.c | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/src/systemctl/systemctl-set-property.c b/src/systemctl/systemctl-set-property.c index 183a7b6a8a..5739bac070 100644 --- a/src/systemctl/systemctl-set-property.c +++ b/src/systemctl/systemctl-set-property.c @@ -6,33 +6,20 @@ #include "systemctl-util.h" #include "systemctl.h" -int set_property(int argc, char *argv[], void *userdata) { - _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; +static int set_property_one(sd_bus *bus, const char *name, char **properties) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_free_ char *n = NULL; - UnitType t; - sd_bus *bus; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; int r; - r = acquire_bus(BUS_MANAGER, &bus); - if (r < 0) - return r; - - polkit_agent_open_maybe(); - r = bus_message_new_method_call(bus, &m, bus_systemd_mgr, "SetUnitProperties"); if (r < 0) return bus_log_create_error(r); - r = unit_name_mangle(argv[1], arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN, &n); - if (r < 0) - return log_error_errno(r, "Failed to mangle unit name: %m"); - - t = unit_name_to_type(n); + UnitType t = unit_name_to_type(name); if (t < 0) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid unit type: %s", n); + return log_error_errno(t, "Invalid unit type: %s", name); - r = sd_bus_message_append(m, "sb", n, arg_runtime); + r = sd_bus_message_append(m, "sb", name, arg_runtime); if (r < 0) return bus_log_create_error(r); @@ -40,7 +27,7 @@ int set_property(int argc, char *argv[], void *userdata) { if (r < 0) return bus_log_create_error(r); - r = bus_append_unit_property_assignment_many(m, t, strv_skip(argv, 2)); + r = bus_append_unit_property_assignment_many(m, t, properties); if (r < 0) return r; @@ -50,7 +37,33 @@ int set_property(int argc, char *argv[], void *userdata) { r = sd_bus_call(bus, m, 0, &error, NULL); if (r < 0) - return log_error_errno(r, "Failed to set unit properties on %s: %s", n, bus_error_message(&error, r)); + return log_error_errno(r, "Failed to set unit properties on %s: %s", + name, bus_error_message(&error, r)); return 0; } + +int set_property(int argc, char *argv[], void *userdata) { + sd_bus *bus; + _cleanup_strv_free_ char **names = NULL; + char **name; + int r, k; + + r = acquire_bus(BUS_MANAGER, &bus); + if (r < 0) + return r; + + polkit_agent_open_maybe(); + + r = expand_unit_names(bus, STRV_MAKE(argv[1]), NULL, &names, NULL); + if (r < 0) + return log_error_errno(r, "Failed to expand '%s' into names: %m", argv[1]); + + r = 0; + STRV_FOREACH(name, names) { + k = set_property_one(bus, *name, strv_skip(argv, 2)); + if (k < 0 && r >= 0) + r = k; + } + return r; +} |