summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-01 16:09:36 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-10 22:38:42 +0100
commit143072edeabe163377d45dedd252d173a56f6455 (patch)
treebf21ae9fbaf0f7bffc836cd842adbd0afcffcb69
parent21296d4b48d03478942f290397c57007a3c9e40e (diff)
manager: only minimize impact if we are in fail mode
-rw-r--r--TODO8
-rw-r--r--src/manager.c5
2 files changed, 11 insertions, 2 deletions
diff --git a/TODO b/TODO
index fcdf1b5dd6..c96827240d 100644
--- a/TODO
+++ b/TODO
@@ -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.
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 */