mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-03 11:39:32 +00:00
Code Issues Releases Wiki Activity

conf: mount_entry_create_dir_file()

Browse Source 
bugfixes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2017-08-01 22:35:29 +02:00
parent d8b712bc61
commit 749f98d922
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/lxc/conf.c
View File

@@ -1827,44 +1827,52 @@ static void cull_mntent_opt(struct mntent *mntent)
} }
static int mount_entry_create_dir_file(const struct mntent *mntent, static int mount_entry_create_dir_file(const struct mntent *mntent,
const char* path, const struct lxc_rootfs *rootfs, const char *path,
const char *lxc_name, const char *lxc_path) const struct lxc_rootfs *rootfs,
const char *lxc_name,
const char *lxc_path)
{ {
char *pathdirname = NULL;
int ret = 0; int ret = 0;
FILE *pathfile = NULL;
if (strncmp(mntent->mnt_type, "overlay", 7) == 0) { if (!strncmp(mntent->mnt_type, "overlay", 7))
if (ovl_mkdir(mntent, rootfs, lxc_name, lxc_path) < 0) ret = ovl_mkdir(mntent, rootfs, lxc_name, lxc_path);
return -1; else if (!strncmp(mntent->mnt_type, "aufs", 4))
} else if (strncmp(mntent->mnt_type, "aufs", 4) == 0) { ret = aufs_mkdir(mntent, rootfs, lxc_name, lxc_path);
if (aufs_mkdir(mntent, rootfs, lxc_name, lxc_path) < 0) if (ret < 0)
return -1; return -1;
}
if (hasmntopt(mntent, "create=dir")) { if (hasmntopt(mntent, "create=dir")) {
if (mkdir_p(path, 0755) < 0) { ret = mkdir_p(path, 0755);
WARN("Failed to create mount target '%s'", path); if (ret < 0 && errno != EEXIST) {
ret = -1; SYSERROR("Failed to create directory \"%s\"", path);
return -1;
} }
} }
if (hasmntopt(mntent, "create=file") && access(path, F_OK)) { if (hasmntopt(mntent, "create=file") && access(path, F_OK)) {
pathdirname = strdup(path); int fd;
pathdirname = dirname(pathdirname); char *p1, *p2;
if (mkdir_p(pathdirname, 0755) < 0) {
WARN("Failed to create target directory"); p1 = strdup(path);
} if (!p1)
pathfile = fopen(path, "wb"); return -1;
if (!pathfile) {
WARN("Failed to create mount target '%s'", path); p2 = dirname(p1);
ret = -1;
} else { ret = mkdir_p(p2, 0755);
fclose(pathfile); free(p1);
if (ret < 0 && errno != EEXIST) {
SYSERROR("Failed to create directory \"%s\"", path);
return -1;
} }
fd = open(path, O_CREAT, 0644);
if (fd < 0)
return -1;
close(fd);
} }
free(pathdirname);
return ret; return 0;
} }
/* rootfs, lxc_name, and lxc_path can be NULL when the container is created /* rootfs, lxc_name, and lxc_path can be NULL when the container is created