From ca949c9dcf17ea8d6512ac4c5c1a806ded9b8dc1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 31 Aug 2010 23:24:47 +0200 Subject: service: rework killing logic so that we always kill the main process, even if it left our service cgroup Related to: http://bugzilla.redhat.com/show_bug.cgi?id=626477 --- src/cgroup-util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/cgroup-util.h') diff --git a/src/cgroup-util.h b/src/cgroup-util.h index d68ccc5f40..2cb6ede4a4 100644 --- a/src/cgroup-util.h +++ b/src/cgroup-util.h @@ -37,8 +37,8 @@ int cg_read_pid(FILE *f, pid_t *_pid); int cg_enumerate_subgroups(const char *controller, const char *path, DIR **_d); int cg_read_subgroup(DIR *d, char **fn); -int cg_kill(const char *controller, const char *path, int sig, bool ignore_self); -int cg_kill_recursive(const char *controller, const char *path, int sig, bool ignore_self, bool remove); +int cg_kill(const char *controller, const char *path, int sig, bool ignore_self, Set *s); +int cg_kill_recursive(const char *controller, const char *path, int sig, bool ignore_self, bool remove, Set *s); int cg_kill_recursive_and_wait(const char *controller, const char *path, bool remove); int cg_migrate(const char *controller, const char *from, const char *to, bool ignore_self); -- cgit v1.2.3-54-g00ecf