From c88e7f4e57fcef7998dcd570e8a8866c5116f0de Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 30 Aug 2010 23:51:52 +0200 Subject: [PATCH] manager: don't try to minimize transaction when using isolate We should not avoid stopping services when using isolate, since that kinda defeats the point of it. http://bugzilla.redhat.com/show_bug.cgi?id=627014 --- fixme | 4 ---- src/manager.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/fixme b/fixme index 1ac8ba2834..f68de38cbf 100644 --- a/fixme +++ b/fixme @@ -80,14 +80,10 @@ v9: * kill-mode=cgroup muss auch die mainpid killen! https://bugzilla.redhat.com/show_bug.cgi?id=626477 -* o_ndelay ausschalten für stdin/stderr/stdout auf socket - * follow LSB exit codes spec in "systemctl start" * oom_score_adj -* fix isolate as runlevel https://bugzilla.redhat.com/show_bug.cgi?id=627014 - * rename failed/maintenance https://bugzilla.redhat.com/show_bug.cgi?id=614619 * systemctl wrapping https://bugzilla.redhat.com/show_bug.cgi?id=626891 https://bugzilla.redhat.com/show_bug.cgi?id=626443 diff --git a/src/manager.c b/src/manager.c index f542883b34..eada82a248 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1226,7 +1226,8 @@ 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. */ - transaction_minimize_impact(m); + if (mode != JOB_ISOLATE) + transaction_minimize_impact(m); /* Third step: Drop redundant jobs */ transaction_drop_redundant(m);