diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-01-16 15:32:27 +0900 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-18 12:19:16 +0100 |
commit | 44198d7ddb426c482a0706622f040690a671a1c2 (patch) | |
tree | 28f05cbfc8751007b632f8d988dff7581dbf71f3 | |
parent | 9f43dde134b6ee0290259ba302ec0149822690fc (diff) | |
download | systemd-44198d7ddb426c482a0706622f040690a671a1c2.tar.gz |
core: add missing dependency DBus properties
Follow-up for 0bc488c99ab2ed3464237607e381f4d72cd321d5.
Also sort dependency properties to make them match the definition of
`enum UnitDependency` in basic/unit-def.h.
Fixes #22133.
(cherry picked from commit adc1b76c30940da2f3fb11275f5b0e54ebbcd7f1)
-rw-r--r-- | docs/TRANSIENT-SETTINGS.md | 1 | ||||
-rw-r--r-- | man/org.freedesktop.systemd1.xml | 32 | ||||
-rw-r--r-- | src/core/dbus-unit.c | 6 |
3 files changed, 27 insertions, 12 deletions
diff --git a/docs/TRANSIENT-SETTINGS.md b/docs/TRANSIENT-SETTINGS.md index 7bab5ec154..2c893cad6e 100644 --- a/docs/TRANSIENT-SETTINGS.md +++ b/docs/TRANSIENT-SETTINGS.md @@ -34,6 +34,7 @@ Most generic unit settings are available for transient units. ✓ PropagatesReloadTo= ✓ ReloadPropagatedFrom= ✓ PartOf= +✓ Upholds= ✓ JoinsNamespaceOf= ✓ RequiresMountsFor= ✓ StopWhenUnneeded= diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index b433f2066c..bd69a00b57 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -1649,6 +1649,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as PartOf = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly as Upholds = ['...', ...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as RequiredBy = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as RequisiteOf = ['...', ...]; @@ -1657,6 +1659,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as BoundBy = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly as UpheldBy = ['...', ...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as ConsistsOf = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as Conflicts = ['...', ...]; @@ -1667,14 +1671,14 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as After = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") - readonly as OnFailure = ['...', ...]; - @org.freedesktop.DBus.Property.EmitsChangedSignal("const") - readonly as OnFailureOf = ['...', ...]; - @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as OnSuccess = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as OnSuccessOf = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly as OnFailure = ['...', ...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") + readonly as OnFailureOf = ['...', ...]; + @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as Triggers = ['...', ...]; @org.freedesktop.DBus.Property.EmitsChangedSignal("const") readonly as TriggeredBy = ['...', ...]; @@ -1820,16 +1824,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <!--property PartOf is not documented!--> + <!--property Upholds is not documented!--> + <!--property RequisiteOf is not documented!--> - <!--property ConsistsOf is not documented!--> + <!--property UpheldBy is not documented!--> - <!--property OnFailureOf is not documented!--> + <!--property ConsistsOf is not documented!--> <!--property OnSuccess is not documented!--> <!--property OnSuccessOf is not documented!--> + <!--property OnFailureOf is not documented!--> + <!--property ReloadPropagatedFrom is not documented!--> <!--property PropagatesStopTo is not documented!--> @@ -1948,6 +1956,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <variablelist class="dbus-property" generated="True" extra-ref="PartOf"/> + <variablelist class="dbus-property" generated="True" extra-ref="Upholds"/> + <variablelist class="dbus-property" generated="True" extra-ref="RequiredBy"/> <variablelist class="dbus-property" generated="True" extra-ref="RequisiteOf"/> @@ -1956,6 +1966,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <variablelist class="dbus-property" generated="True" extra-ref="BoundBy"/> + <variablelist class="dbus-property" generated="True" extra-ref="UpheldBy"/> + <variablelist class="dbus-property" generated="True" extra-ref="ConsistsOf"/> <variablelist class="dbus-property" generated="True" extra-ref="Conflicts"/> @@ -1966,14 +1978,14 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { <variablelist class="dbus-property" generated="True" extra-ref="After"/> - <variablelist class="dbus-property" generated="True" extra-ref="OnFailure"/> - - <variablelist class="dbus-property" generated="True" extra-ref="OnFailureOf"/> - <variablelist class="dbus-property" generated="True" extra-ref="OnSuccess"/> <variablelist class="dbus-property" generated="True" extra-ref="OnSuccessOf"/> + <variablelist class="dbus-property" generated="True" extra-ref="OnFailure"/> + + <variablelist class="dbus-property" generated="True" extra-ref="OnFailureOf"/> + <variablelist class="dbus-property" generated="True" extra-ref="Triggers"/> <variablelist class="dbus-property" generated="True" extra-ref="TriggeredBy"/> diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index f7a1210a34..eef491740c 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -872,19 +872,21 @@ const sd_bus_vtable bus_unit_vtable[] = { SD_BUS_PROPERTY("Wants", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("BindsTo", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("PartOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("Upholds", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RequiredBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("RequisiteOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("WantedBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("BoundBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("UpheldBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ConsistsOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Conflicts", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ConflictedBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Before", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("After", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("OnFailure", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("OnFailureOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("OnSuccess", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("OnSuccessOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("OnFailure", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("OnFailureOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Triggers", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("TriggeredBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("PropagatesReloadTo", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST), |