manager: only minimize impact if we are in fail mode

diff --git a/TODO b/TODO
index fcdf1b5dd6fe3a8fe65310011250d97fc92834b2..c96827240dd990659d8f87c9bcfe291e174ad76b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -74,6 +74,14 @@
 
 * we now order plymouth after udev-trigger. Can we optimize this?
 
 
 * 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.
 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 9fa4877016a786be24bfc56ff821d42626c37dd1..afd29cf7c3c69970b7b5f3c0b29419b2016d81b6 100644 (file)
--- 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->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;
 
                                 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. */
         /* 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 */
                 transaction_minimize_impact(m);
 
         /* Third step: Drop redundant jobs */