32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 524147c1ef991edf4432aac51c880b363b4402df Mon Sep 17 00:00:00 2001
|
|
From: Marius Vollmer <mvollmer@redhat.com>
|
|
Date: Thu, 31 Oct 2013 15:55:07 +0200
|
|
Subject: [PATCH] logind: use correct "who" enum values with KillUnit.
|
|
|
|
---
|
|
src/login/logind-dbus.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
|
|
index bb85c7d..583d62e 100644
|
|
--- a/src/login/logind-dbus.c
|
|
+++ b/src/login/logind-dbus.c
|
|
@@ -2799,7 +2799,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
|
|
assert(manager);
|
|
assert(unit);
|
|
|
|
- w = who == KILL_LEADER ? "process" : "cgroup";
|
|
+ w = who == KILL_LEADER ? "control" : "all";
|
|
assert_cc(sizeof(signo) == sizeof(int32_t));
|
|
|
|
r = bus_method_call_with_reply(
|
|
@@ -2815,7 +2815,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
|
|
DBUS_TYPE_INT32, &signo,
|
|
DBUS_TYPE_INVALID);
|
|
if (r < 0) {
|
|
- log_error("Failed to stop unit %s: %s", unit, bus_error(error, r));
|
|
+ log_error("Failed to kill unit %s: %s", unit, bus_error(error, r));
|
|
return r;
|
|
}
|
|
|