Skip to content

Commit adc1b76

Browse files
yuwatabluca
yuwata
authored and
bluca
committed
core: add missing dependency DBus properties
Follow-up for 0bc488c. Also sort dependency properties to make them match the definition of `enum UnitDependency` in basic/unit-def.h. Fixes systemd#22133.
1 parent cc8943b commit adc1b76

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

‎docs/TRANSIENT-SETTINGS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Most generic unit settings are available for transient units.
3434
✓ PropagatesReloadTo=
3535
✓ ReloadPropagatedFrom=
3636
✓ PartOf=
37+
✓ Upholds=
3738
✓ JoinsNamespaceOf=
3839
✓ RequiresMountsFor=
3940
✓ StopWhenUnneeded=

‎man/org.freedesktop.systemd1.xml‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
16491649
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16501650
readonly as PartOf = ['...', ...];
16511651
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
1652+
readonly as Upholds = ['...', ...];
1653+
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16521654
readonly as RequiredBy = ['...', ...];
16531655
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16541656
readonly as RequisiteOf = ['...', ...];
@@ -1657,6 +1659,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
16571659
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16581660
readonly as BoundBy = ['...', ...];
16591661
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
1662+
readonly as UpheldBy = ['...', ...];
1663+
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16601664
readonly as ConsistsOf = ['...', ...];
16611665
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16621666
readonly as Conflicts = ['...', ...];
@@ -1667,14 +1671,14 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
16671671
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16681672
readonly as After = ['...', ...];
16691673
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
1670-
readonly as OnFailure = ['...', ...];
1671-
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
1672-
readonly as OnFailureOf = ['...', ...];
1673-
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16741674
readonly as OnSuccess = ['...', ...];
16751675
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16761676
readonly as OnSuccessOf = ['...', ...];
16771677
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
1678+
readonly as OnFailure = ['...', ...];
1679+
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
1680+
readonly as OnFailureOf = ['...', ...];
1681+
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16781682
readonly as Triggers = ['...', ...];
16791683
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
16801684
readonly as TriggeredBy = ['...', ...];
@@ -1820,16 +1824,20 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
18201824

18211825
<!--property PartOf is not documented!-->
18221826

1827+
<!--property Upholds is not documented!-->
1828+
18231829
<!--property RequisiteOf is not documented!-->
18241830

1825-
<!--property ConsistsOf is not documented!-->
1831+
<!--property UpheldBy is not documented!-->
18261832

1827-
<!--property OnFailureOf is not documented!-->
1833+
<!--property ConsistsOf is not documented!-->
18281834

18291835
<!--property OnSuccess is not documented!-->
18301836

18311837
<!--property OnSuccessOf is not documented!-->
18321838

1839+
<!--property OnFailureOf is not documented!-->
1840+
18331841
<!--property ReloadPropagatedFrom is not documented!-->
18341842

18351843
<!--property PropagatesStopTo is not documented!-->
@@ -1948,6 +1956,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
19481956

19491957
<variablelist class="dbus-property" generated="True" extra-ref="PartOf"/>
19501958

1959+
<variablelist class="dbus-property" generated="True" extra-ref="Upholds"/>
1960+
19511961
<variablelist class="dbus-property" generated="True" extra-ref="RequiredBy"/>
19521962

19531963
<variablelist class="dbus-property" generated="True" extra-ref="RequisiteOf"/>
@@ -1956,6 +1966,8 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
19561966

19571967
<variablelist class="dbus-property" generated="True" extra-ref="BoundBy"/>
19581968

1969+
<variablelist class="dbus-property" generated="True" extra-ref="UpheldBy"/>
1970+
19591971
<variablelist class="dbus-property" generated="True" extra-ref="ConsistsOf"/>
19601972

19611973
<variablelist class="dbus-property" generated="True" extra-ref="Conflicts"/>
@@ -1966,14 +1978,14 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice {
19661978

19671979
<variablelist class="dbus-property" generated="True" extra-ref="After"/>
19681980

1969-
<variablelist class="dbus-property" generated="True" extra-ref="OnFailure"/>
1970-
1971-
<variablelist class="dbus-property" generated="True" extra-ref="OnFailureOf"/>
1972-
19731981
<variablelist class="dbus-property" generated="True" extra-ref="OnSuccess"/>
19741982

19751983
<variablelist class="dbus-property" generated="True" extra-ref="OnSuccessOf"/>
19761984

1985+
<variablelist class="dbus-property" generated="True" extra-ref="OnFailure"/>
1986+
1987+
<variablelist class="dbus-property" generated="True" extra-ref="OnFailureOf"/>
1988+
19771989
<variablelist class="dbus-property" generated="True" extra-ref="Triggers"/>
19781990

19791991
<variablelist class="dbus-property" generated="True" extra-ref="TriggeredBy"/>

‎src/core/dbus-unit.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,19 +872,21 @@ const sd_bus_vtable bus_unit_vtable[] = {
872872
SD_BUS_PROPERTY("Wants", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
873873
SD_BUS_PROPERTY("BindsTo", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
874874
SD_BUS_PROPERTY("PartOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
875+
SD_BUS_PROPERTY("Upholds", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
875876
SD_BUS_PROPERTY("RequiredBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
876877
SD_BUS_PROPERTY("RequisiteOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
877878
SD_BUS_PROPERTY("WantedBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
878879
SD_BUS_PROPERTY("BoundBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
880+
SD_BUS_PROPERTY("UpheldBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
879881
SD_BUS_PROPERTY("ConsistsOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
880882
SD_BUS_PROPERTY("Conflicts", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
881883
SD_BUS_PROPERTY("ConflictedBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
882884
SD_BUS_PROPERTY("Before", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
883885
SD_BUS_PROPERTY("After", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
884-
SD_BUS_PROPERTY("OnFailure", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
885-
SD_BUS_PROPERTY("OnFailureOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
886886
SD_BUS_PROPERTY("OnSuccess", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
887887
SD_BUS_PROPERTY("OnSuccessOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
888+
SD_BUS_PROPERTY("OnFailure", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
889+
SD_BUS_PROPERTY("OnFailureOf", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
888890
SD_BUS_PROPERTY("Triggers", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
889891
SD_BUS_PROPERTY("TriggeredBy", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),
890892
SD_BUS_PROPERTY("PropagatesReloadTo", "as", property_get_dependencies, 0, SD_BUS_VTABLE_PROPERTY_CONST),

0 commit comments

Comments
 (0)