chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: kill processes, not tasks and other cgroup changes
[elogind.git]
/
src
/
systemctl.c
diff --git
a/src/systemctl.c
b/src/systemctl.c
index 53b6b47b6129662848fa121dd1bf85431df01597..799f57d006d3b0b6b0883e7eba18cbcad1418cbe 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-43,6
+43,7
@@
#include "strv.h"
#include "dbus-common.h"
#include "cgroup-show.h"
#include "strv.h"
#include "dbus-common.h"
#include "cgroup-show.h"
+#include "cgroup-util.h"
#include "list.h"
static const char *arg_type = NULL;
#include "list.h"
static const char *arg_type = NULL;
@@
-1053,6
+1054,7
@@
typedef struct UnitStatusInfo {
static void print_status_info(UnitStatusInfo *i) {
ExecStatusInfo *p;
static void print_status_info(UnitStatusInfo *i) {
ExecStatusInfo *p;
+ int r;
assert(i);
assert(i);
@@
-1183,7
+1185,10
@@
static void print_status_info(UnitStatusInfo *i) {
else
c = 0;
else
c = 0;
- show_cgroup_recursive(i->default_control_group, "\t\t ", c);
+ if ((r = cg_init()) < 0)
+ log_error("Failed to initialize libcg: %s", strerror(-r));
+ else
+ show_cgroup_recursive(i->default_control_group, "\t\t ", c);
}
}
}
}