From: Christian Brauner Date: Mon, 25 Jul 2016 15:10:47 +0000 (+0200) Subject: cgfsng: fix is_lxcfs() and is_cgroupfs() X-Git-Tag: lxc-2.1.0~375^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1100%2Fhead;p=thirdparty%2Flxc.git cgfsng: fix is_lxcfs() and is_cgroupfs() Both functions advertise that they return true when strncmp() == 0 and false when strncmp() != 0 but so far they returned the exact opposite. Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgfsng.c b/src/lxc/cgfsng.c index 0ea7b392e..16a945756 100644 --- a/src/lxc/cgfsng.c +++ b/src/lxc/cgfsng.c @@ -438,7 +438,7 @@ static bool is_lxcfs(const char *line) char *p = strstr(line, " - "); if (!p) return false; - return strncmp(p, " - fuse.lxcfs ", 14); + return strncmp(p, " - fuse.lxcfs ", 14) == 0; } /* @@ -488,7 +488,7 @@ static bool is_cgroupfs(char *line) char *p = strstr(line, " - "); if (!p) return false; - return strncmp(p, " - cgroup ", 10); + return strncmp(p, " - cgroup ", 10) == 0; } /* Add a controller to our list of hierarchies */ @@ -1350,7 +1350,7 @@ static bool cgfsng_mount(void *hdata, const char *root, int type) free(controllerpath); goto bad; } - + r = do_secondstage_mounts_if_needed(type, h, controllerpath, path2, d->container_cgroup); free(controllerpath);