mount: do not try to mount disable cgroup controllers

https://bugzilla.redhat.com/show_bug.cgi?id=655222

1 files changed, 7 insertions, 1 deletions

diff --git a/src/mount-setup.c b/src/mount-setup.c
index 14ac18125f..7eb806e7fd 100644
--- a/src/mount-setup.c
+++ b/src/mount-setup.c
@@ -138,8 +138,9 @@ static int mount_cgroup_controllers(void) {
         for (;;) {
                 MountPoint p;
                 char *controller, *where;
+                int enabled = false;
 
-                if (fscanf(f, "%ms %*i %*i %*i", &controller) != 1) {
+                if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 1) {
 
                         if (feof(f))
                                 break;
@@ -149,6 +150,11 @@ static int mount_cgroup_controllers(void) {
                         goto finish;
                 }
 
+                if (!enabled) {
+                        free(controller);
+                        continue;
+                }
+
                 if (asprintf(&where, "/sys/fs/cgroup/%s", controller) < 0) {
                         free(controller);
                         r = -ENOMEM;