picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

manager: only minimize impact if we are in fail mode

This commit is contained in:
Lennart Poettering 2010-11-01 16:09:36 +01:00
parent 21296d4b48
commit 143072edea
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TODO
View File

@ -74,6 +74,14 @@
* we now order plymouth after udev-trigger. Can we optimize this?
* disable respawn when we are going down anyway.
* isolate doesn't kill pending jobs.
* warum wird fsck-root und plymouth-start.service von bluetooth.target reingezogen?
* drop tmp.mount
External:
* patch kernel for xattr support in /dev, /proc/, /sys and /sys/fs/cgroup.

5
src/manager.c
View File

@ -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 */