mirror of
https://github.com/systemd/systemd
synced 2024-10-15 04:24:19 +00:00
manager: allow assignment of properties on target/swap/device units
E.g. Documentation or Markers could apply to any unit type. This already worked partially, because a direct dbus call could be made: After rebuild with the patch, but before the manager has been restarted: $ build/systemctl --user set-property dev-zram0.swap Markers=+needs-restart $ build/systemctl --user show -p Markers dev-zram0.swap Markers=needs-restart I noticed that that the rpm unit restart helper was throwing errors for target units. We should just let the Markers be set for those too, even if it doesn't do anything in the end. This way we don't need to special-case by unit type.
This commit is contained in:
parent
e4e6cfaad0
commit
eab62c01ef
|
@ -2437,10 +2437,6 @@ int bus_unit_set_properties(
|
|||
if (r < 0)
|
||||
return r;
|
||||
|
||||
if (!UNIT_VTABLE(u)->bus_set_property)
|
||||
return sd_bus_error_setf(error, SD_BUS_ERROR_PROPERTY_READ_ONLY,
|
||||
"Objects of this type do not support setting properties.");
|
||||
|
||||
r = sd_bus_message_enter_container(message, 'v', NULL);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
@ -2448,7 +2444,10 @@ int bus_unit_set_properties(
|
|||
/* If not for real, then mask out the two target flags */
|
||||
f = for_real ? flags : (flags & ~(UNIT_RUNTIME|UNIT_PERSISTENT));
|
||||
|
||||
if (UNIT_VTABLE(u)->bus_set_property)
|
||||
r = UNIT_VTABLE(u)->bus_set_property(u, name, message, f, error);
|
||||
else
|
||||
r = 0;
|
||||
if (r == 0 && u->transient && u->load_state == UNIT_STUB)
|
||||
r = bus_unit_set_transient_property(u, name, message, f, error);
|
||||
if (r == 0)
|
||||
|
|
|
@ -2640,12 +2640,10 @@ int bus_append_unit_property_assignment(sd_bus_message *m, UnitType t, const cha
|
|||
case UNIT_TARGET:
|
||||
case UNIT_DEVICE:
|
||||
case UNIT_SWAP:
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
|
||||
"Not supported unit type");
|
||||
break;
|
||||
|
||||
default:
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
|
||||
"Invalid unit type");
|
||||
assert_not_reached();
|
||||
}
|
||||
|
||||
r = bus_append_unit_property(m, field, eq);
|
||||
|
|
Loading…
Reference in a new issue