X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcgroups.c;h=17b12d0435150189bba3fe15ab9a6fd66d57be76;hb=456d6b6b5f855b588eaef23b26e5b91d14586cc5;hp=061aa326851a129950303769de35c133e6a7f357;hpb=4b4eee900b167cfdf17528e70c9c0659eb0329b0;p=collectd.git

diff --git a/src/cgroups.c b/src/cgroups.c
index 061aa326..17b12d04 100644
--- a/src/cgroups.c
+++ b/src/cgroups.c
@@ -93,7 +93,7 @@ static int read_cpuacct_procs (const char *dirname, char const *cgroup_name,
 	if (fh == NULL)
 	{
 		char errbuf[1024];
-		ERROR ("cgroups pluign: fopen (\"%s\") failed: %s",
+		ERROR ("cgroups plugin: fopen (\"%s\") failed: %s",
 				abs_path,
 				sstrerror (errno, errbuf, sizeof (errbuf)));
 		return (-1);
@@ -221,8 +221,9 @@ static int cgroups_read (void)
 	{
 		/* Find the cgroup mountpoint which contains the cpuacct
 		 * controller. */
-		if (strcmp(mnt_ptr->type, "cgroup") != 0 ||
-			!cu_mount_getoptionvalue(mnt_ptr->options, "cpuacct"))
+		if ((strcmp(mnt_ptr->type, "cgroup") != 0)
+				|| !cu_mount_checkoption(mnt_ptr->options,
+					"cpuacct", /* full = */ 1))
 			continue;
 
 		walk_directory (mnt_ptr->dir, read_cpuacct_root,