diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-09-07 14:08:24 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-09-07 14:10:53 +0200 |
commit | d11a76451f21dbec5dcc0d65444b76124764d3b5 (patch) | |
tree | df3ff8bc19475ce65e2f2506f60ebe6039024452 | |
parent | 47f5a38cdf98a220d6a0d4eb11a710a0a42ae5c4 (diff) |
unit: move "not supported" check after condition check in unit_start()
Make sure we always check conditions before checking whether the unit
type is supported in unit_start(), since condition checks are "clean
errors", while "not supported" errors are fatal.
This cleans up the boot output of systemd in containers, where a lot of
NOTSUPP lines were shown befor this fix.
This partially reverts 8ff4d2ab0d4758e914aea6d86154d85f2b2c787f which
reorder the checks.
-rw-r--r-- | src/core/unit.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 45ce1b172d..1aa0321b23 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1420,10 +1420,6 @@ int unit_start(Unit *u) { if (u->load_state != UNIT_LOADED) return -EINVAL; - /* Units of types that aren't supported annot be started either */ - if (!unit_supported(u)) - return -EOPNOTSUPP; - /* If this is already started, then this will succeed. Note * that this will even succeed if this unit is not startable * by the user. This is relied on to detect when we need to @@ -1449,6 +1445,15 @@ int unit_start(Unit *u) { return -EPROTO; } + /* Units of types that aren't supported cannot be + * started. Note that we do this test only after the condition + * checks, so that we rather return condition check errors + * (which are usually not considered a true failure) than "not + * supported" errors (which are considered a failure). + */ + if (!unit_supported(u)) + return -EOPNOTSUPP; + /* Forward to the main object, if we aren't it. */ following = unit_following(u); if (following) { |