mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-04 10:29:35 +00:00
Code Issues Releases Wiki Activity

conf: mount_entry_on_absolute_rootfs()

Browse Source 
non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2017-08-01 22:14:48 +02:00
parent 19b5d7557b
commit bdd2b34c41
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/lxc/conf.c
View File

@@ -1927,21 +1927,21 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
const char *lxc_name, const char *lxc_name,
const char *lxc_path) const char *lxc_path)
{ {
int offset;
char *aux; char *aux;
char path[MAXPATHLEN];
int r, ret = 0, offset;
const char *lxcpath; const char *lxcpath;
char path[MAXPATHLEN];
int ret = 0;
lxcpath = lxc_global_config_value("lxc.lxcpath"); lxcpath = lxc_global_config_value("lxc.lxcpath");
if (!lxcpath) { if (!lxcpath)
ERROR("Out of memory");
return -1; return -1;
}
/* if rootfs->path is a blockdev path, allow container fstab to /* If rootfs->path is a blockdev path, allow container fstab to use
* use $lxcpath/CN/rootfs as the target prefix */ * <lxcpath>/<name>/rootfs" as the target prefix.
r = snprintf(path, MAXPATHLEN, "%s/%s/rootfs", lxcpath, lxc_name); */
if (r < 0 || r >= MAXPATHLEN) ret = snprintf(path, MAXPATHLEN, "%s/%s/rootfs", lxcpath, lxc_name);
if (ret < 0 || ret >= MAXPATHLEN)
goto skipvarlib; goto skipvarlib;
aux = strstr(mntent->mnt_dir, path); aux = strstr(mntent->mnt_dir, path);
@@ -1953,19 +1953,15 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
skipvarlib: skipvarlib:
aux = strstr(mntent->mnt_dir, rootfs->path); aux = strstr(mntent->mnt_dir, rootfs->path);
if (!aux) { if (!aux) {
WARN("ignoring mount point '%s'", mntent->mnt_dir); WARN("Ignoring mount point \"%s\"", mntent->mnt_dir);
return ret; return ret;
} }
offset = strlen(rootfs->path); offset = strlen(rootfs->path);
skipabs: skipabs:
ret = snprintf(path, MAXPATHLEN, "%s/%s", rootfs->mount, aux + offset);
r = snprintf(path, MAXPATHLEN, "%s/%s", rootfs->mount, if (ret < 0 || ret >= MAXPATHLEN)
aux + offset);
if (r < 0 || r >= MAXPATHLEN) {
WARN("pathnme too long for '%s'", mntent->mnt_dir);
return -1; return -1;
}
return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path); return mount_entry_on_generic(mntent, path, rootfs, lxc_name, lxc_path);
} }