From bf6dcfa6a79a459239799a21bdcba115d696a006 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Thu, 14 Feb 2013 00:49:26 +0200 Subject: unit: fix the race in deserialization. unit_notify is fired in deserelization code (particulary in service_set_state). Units passed in random order, and there is possibility, that unit with StopWhenUnneeded=yes passed before it actual dependecies. In that case unit will be stopped as unneeded, because deps in UNIT_INACTIVE state yet. So, reuse similar logic (unit.c:1421) to avoid this race --- src/core/unit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c index e2c06ae8b6..601be60ed0 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -1517,7 +1517,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su /* Maybe we finished startup and are now ready for being * stopped because unneeded? */ - unit_check_unneeded(u); + if (u->manager->n_reloading <= 0) + unit_check_unneeded(u); unit_add_to_dbus_queue(u); unit_add_to_gc_queue(u); -- cgit v1.2.3-54-g00ecf