Blame 0104-cgroup-util-Don-t-send-SIGCONT-after-SIGKILL.patch
|
 |
9ecd5b8 |
From ecbc18c00e5312f0e422a3f5482a5987a7ad0aed Mon Sep 17 00:00:00 2001
|
|
|
9ecd5b8 |
From: Ross Lagerwall <rosslagerwall@gmail.com>
|
|
|
9ecd5b8 |
Date: Sat, 29 Nov 2014 11:31:30 +0000
|
|
|
9ecd5b8 |
Subject: [PATCH] cgroup-util: Don't send SIGCONT after SIGKILL
|
|
|
9ecd5b8 |
|
|
|
9ecd5b8 |
(cherry picked from commit dc8962da74c62779d8899a8166f704c30287fff0)
|
|
|
9ecd5b8 |
---
|
|
|
9ecd5b8 |
src/shared/cgroup-util.c | 2 +-
|
|
|
9ecd5b8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ecd5b8 |
|
|
|
9ecd5b8 |
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
|
|
|
9ecd5b8 |
index da8e885226..3e6629f853 100644
|
|
|
9ecd5b8 |
--- a/src/shared/cgroup-util.c
|
|
|
9ecd5b8 |
+++ b/src/shared/cgroup-util.c
|
|
|
9ecd5b8 |
@@ -195,7 +195,7 @@ int cg_kill(const char *controller, const char *path, int sig, bool sigcont, boo
|
|
|
9ecd5b8 |
if (ret >= 0 && errno != ESRCH)
|
|
|
9ecd5b8 |
ret = -errno;
|
|
|
9ecd5b8 |
} else {
|
|
|
9ecd5b8 |
- if (sigcont)
|
|
|
9ecd5b8 |
+ if (sigcont && sig != SIGKILL)
|
|
|
9ecd5b8 |
kill(pid, SIGCONT);
|
|
|
9ecd5b8 |
|
|
|
9ecd5b8 |
if (ret == 0)
|