Merge pull request #2068 from grawity/cgls-error-v2

cgls: add a better error message for missing cgroupfs [v2]
2015-11-30 19:32:19 +01:00 · 2015-11-30 19:32:19 +01:00 · bca27e1729
parent de418eb91c e97a84757f
commit bca27e1729
1 changed files with 3 additions and 1 deletions
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@ -131,7 +131,9 @@ static int get_cgroup_root(char **ret) {

        if (!arg_machine) {
                r = cg_get_root_path(ret);
-                if (r < 0)
+                if (r == -ENOEXEC)
+                        return log_error_errno(r, "Failed to get root control group path: No cgroup filesystem mounted on /sys/fs/cgroup");
+                else if (r < 0)
                        return log_error_errno(r, "Failed to get root control group path: %m");

                return 0;