diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-11-01 16:09:36 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-11-10 22:38:42 +0100 |
| commit | 143072edeabe163377d45dedd252d173a56f6455 (patch) | |
| tree | bf21ae9fbaf0f7bffc836cd842adbd0afcffcb69 /src/manager.c | |
| parent | 21296d4b48d03478942f290397c57007a3c9e40e (diff) | |
manager: only minimize impact if we are in fail mode
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/manager.c b/src/manager.c index 9fa4877016..afd29cf7c3 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1133,7 +1133,8 @@ static void transaction_minimize_impact(Manager *m) { j->type == JOB_STOP && UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(j->unit)); changes_existing_job = - j->unit->meta.job && job_type_is_conflicting(j->type, j->unit->meta.job->type); + j->unit->meta.job && + job_type_is_conflicting(j->type, j->unit->meta.job->type); if (!stops_running_service && !changes_existing_job) continue; @@ -1234,7 +1235,7 @@ static int transaction_activate(Manager *m, JobMode mode, DBusError *e) { /* Second step: Try not to stop any running services if * we don't have to. Don't try to reverse running * jobs if we don't have to. */ - if (mode != JOB_ISOLATE) + if (mode == JOB_FAIL) transaction_minimize_impact(m); /* Third step: Drop redundant jobs */ |