chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
umount: don't try to remount bind mounts ro during shutdown
[elogind.git]
/
src
/
cgls.c
diff --git
a/src/cgls.c
b/src/cgls.c
index f1f3046edfd1897d2709c43c734ed3a5349f8e54..6f083015edee6f83cd38019254037d1c23a65188 100644
(file)
--- a/
src/cgls.c
+++ b/
src/cgls.c
@@
-72,7
+72,7
@@
static int parse_argv(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- int r = 0, retval =
1
;
+ int r = 0, retval =
EXIT_FAILURE
;
log_parse_environment();
log_open();
log_parse_environment();
log_open();
@@
-80,7
+80,7
@@
int main(int argc, char *argv[]) {
if ((r = parse_argv(argc, argv)) < 0)
goto finish;
else if (r == 0) {
if ((r = parse_argv(argc, argv)) < 0)
goto finish;
else if (r == 0) {
- retval =
0
;
+ retval =
EXIT_SUCCESS
;
goto finish;
}
goto finish;
}
@@
-106,8
+106,18
@@
int main(int argc, char *argv[]) {
if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
r = show_cgroup_by_path(p, NULL, 0);
if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
r = show_cgroup_by_path(p, NULL, 0);
- } else
- r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, "/", NULL, 0);
+ } else {
+ char *root = NULL;
+ const char *t = NULL;
+
+ if ((r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root)) < 0)
+ t = "/";
+ else
+ t = root;
+
+ r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0);
+ free(root);
+ }
free(p);
}
free(p);
}
@@
-115,7
+125,7
@@
int main(int argc, char *argv[]) {
if (r < 0)
log_error("Failed to list cgroup tree: %s", strerror(-r));
if (r < 0)
log_error("Failed to list cgroup tree: %s", strerror(-r));
- retval =
0
;
+ retval =
EXIT_SUCCESS
;
finish:
finish: