summaryrefslogtreecommitdiff
path: root/src/core/dbus-unit.c
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2022-03-08 22:13:37 +0000
committerLuca Boccassi <bluca@debian.org>2022-03-10 13:16:21 +0000
commitee3ae55e7537c716530b293c91f3fb9ae22a8049 (patch)
treef94534ceb5f937f2e3b140ff110a891fba1e4349 /src/core/dbus-unit.c
parentbd844eae233b74ebf151ceefa0a5f026978bebab (diff)
downloadsystemd-ee3ae55e7537c716530b293c91f3fb9ae22a8049.tar.gz
core: do not return 'skipped' when Condition*= fail with StartUnitWithFlags()
Backward incompatible change to avoid returning 'skipped' if a condition causes a job activation to be skipped when using StartUnitWithFlags(). Job results are broadcasted, so it is theoretically possible that existing software could get confused if they see this result. Replaces https://github.com/systemd/systemd/pull/22369
Diffstat (limited to 'src/core/dbus-unit.c')
-rw-r--r--src/core/dbus-unit.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index 1e01241676..6542d50330 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -417,10 +417,6 @@ int bus_unit_method_start_generic(
return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_INVALID_ARGS,
"Invalid 'flags' parameter '%" PRIu64 "'",
input_flags);
-
- /* The new method unconditionally uses the new behaviour of returning 'skip' when
- * a job is skipped. */
- job_flags |= BUS_UNIT_QUEUE_RETURN_SKIP_ON_CONDITION_FAIL;
}
r = bus_verify_manage_units_async_full(