Merge pull request #2050 from tanyifeng/small_fix

src/lxc/conf.c

@@ -1813,8 +1813,8 @@ static char *get_field(char *src, int nfields)
 
 static int mount_entry(const char *fsname, const char *target,
 		       const char *fstype, unsigned long mountflags,
-		       const char *data, int optional, int dev,
-		       int relative, const char *rootfs)
+		       const char *data, bool optional, bool dev,
+		       bool relative, const char *rootfs)
 {
 	int ret;
 	char srcbuf[MAXPATHLEN];

src/tests/parse_config_file.c

@@ -478,7 +478,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (!c->get_config_item(c, "lxc.id_map", retval, sizeof(retval))) {
-		lxc_error("%s\n", "failed to get config item \"lxc.cgroup\"");
+		lxc_error("%s\n", "failed to get config item \"lxc.id_map\"");
 		return -1;
 	}
 
@@ -506,7 +506,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (!c->get_config_item(c, "lxc.idmap", retval, sizeof(retval))) {
-		lxc_error("%s\n", "failed to get config item \"lxc.cgroup\"");
+		lxc_error("%s\n", "failed to get config item \"lxc.idmap\"");
 		return -1;
 	}