Fixed parsing of mount options

hasmntopt() returns start of the matching string, i.e. when looking for
'cpuacct' option it can return 'cpuacct,cpuset' if these two are mounted
together. So, don't use result of this function, use internal table of
controllers instead when checking for duplicates.

Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Acked-by: Ivana Hutarova Varekova<varekova@redhat.com>

diff --git a/src/api.c b/src/api.c
index b76b79321242b22495715b47be841ded4243acdd..c3dba988a06d6574b3345abb2774ca38f54e61ad 100644 (file)
--- a/src/api.c
+++ b/src/api.c
@@ -817,7 +817,8 @@ int cgroup_init(void)
                        /* do not have duplicates in mount table */
                        duplicate = 0;
                        for  (j = 0; j < found_mnt; j++) {
-                               if (strncmp(mntopt, cg_mount_table[j].name,
+                               if (strncmp(controllers[i],
+                                                       cg_mount_table[j].name,
                                                        FILENAME_MAX) == 0) {
                                        duplicate = 1;
                                        break;