Commit dc73e0f0 by Wolfgang Bumiller

confile: allow including nonexisting directories

If an include directive ends with a trailing slash, we now always assume it is a directory and do not treat the non-existence as an error. Signed-off-by: 's avatarWolfgang Bumiller <w.bumiller@proxmox.com>
parent 9508fc27
......@@ -2689,7 +2689,7 @@ static int do_includedir(const char *dirp, struct lxc_conf *lxc_conf)
dir = opendir(dirp);
if (!dir)
return -errno;
return errno == ENOENT ? 0 : -errno;
while ((direntp = readdir(dir))) {
const char *fnam;
......@@ -2726,7 +2726,7 @@ static int set_config_includefiles(const char *key, const char *value,
return 0;
}
if (is_dir(value))
if (value[strlen(value)-1] == '/' || is_dir(value))
return do_includedir(value, lxc_conf);
return lxc_config_read(value, lxc_conf, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment