diff --git a/man/org.freedesktop.systemd1.xml b/man/org.freedesktop.systemd1.xml index 50680e6b37..490c83bb96 100644 --- a/man/org.freedesktop.systemd1.xml +++ b/man/org.freedesktop.systemd1.xml @@ -2501,7 +2501,7 @@ node /org/freedesktop/systemd1/unit/avahi_2ddaemon_2eservice { condition is a trigger condition, whether the condition is reversed, the right hand side of the condition (e.g. the path in case of ConditionPathExists), and the status. The status can be 0, in which case the condition hasn't been checked yet, a positive value, in which case the - condition passed, or a negative value, in which case the condition failed. Currently only 0, +1, and -1 + condition passed, or a negative value, in which case the condition is not met. Currently only 0, +1, and -1 are used, but additional values may be used in the future, retaining the meaning of zero/positive/negative values. diff --git a/src/core/unit.c b/src/core/unit.c index 846d15b415..409801aed2 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1890,12 +1890,12 @@ int unit_start(Unit *u, ActivationDetails *details) { if (UNIT_VTABLE(u)->once_only && dual_timestamp_is_set(&u->inactive_enter_timestamp)) return -ESTALE; - /* If the conditions failed, don't do anything at all. If we already are activating this call might + /* If the conditions were unmet, don't do anything at all. If we already are activating this call might * still be useful to speed up activation in case there is some hold-off time, but we don't want to * recheck the condition in that case. */ if (state != UNIT_ACTIVATING && !unit_test_condition(u)) - return log_unit_debug_errno(u, SYNTHETIC_ERRNO(ECOMM), "Starting requested but condition failed. Not starting unit."); + return log_unit_debug_errno(u, SYNTHETIC_ERRNO(ECOMM), "Starting requested but condition not met. Not starting unit."); /* If the asserts failed, fail the entire job */ if (state != UNIT_ACTIVATING && diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c index 4a14c105dd..6422550af4 100644 --- a/src/systemctl/systemctl-show.c +++ b/src/systemctl/systemctl-show.c @@ -516,7 +516,7 @@ static void print_status_info( if (!i->condition_result && i->condition_timestamp > 0) { int n = 0; - printf(" Condition: start %scondition failed%s at %s; %s\n", + printf(" Condition: start %scondition unmet%s at %s; %s\n", ansi_highlight_yellow(), ansi_normal(), FORMAT_TIMESTAMP_STYLE(i->condition_timestamp, arg_timestamp_style), FORMAT_TIMESTAMP_RELATIVE(i->condition_timestamp));