proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 15:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

substitute the absolute rootfs mount path

Browse Source 
Change the mount point in the rootfs because we mount the rootfs
in ROOTFSDIR for the pivot. We have to substitute the real mount
path to the new path located in ROOTFSDIR.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Daniel Lezcano 2011-01-13 16:25:14 +01:00 committed by Daniel Lezcano
parent 911324ef25
commit 013bd42848
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lxc/conf.c
View File

@ -959,28 +959,32 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent)
} }
static int mount_entry_on_absolute_rootfs(struct mntent *mntent, static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
const char *rootfs) const struct lxc_rootfs *rootfs)
{ {
char *aux;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
unsigned long mntflags; unsigned long mntflags;
char *mntdata; char *mntdata;
int ret; int ret = 0;
if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) { if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {
ERROR("failed to parse mount option '%s'", mntent->mnt_opts); ERROR("failed to parse mount option '%s'", mntent->mnt_opts);
return -1; return -1;
} }
if (strncmp(mntent->mnt_dir, rootfs, strlen(rootfs))) aux = strstr(mntent->mnt_dir, rootfs->path);
WARN("mount target directory '%s' is outside " if (!aux) {
"container root", mntent->mnt_dir); WARN("ignoring mount point '%s'", mntent->mnt_dir);
else goto out;
WARN("mount target directory '%s' is not " }
"relative to container root", mntent->mnt_dir);
ret = mount_entry(mntent->mnt_fsname, mntent->mnt_dir, mntent->mnt_type, snprintf(path, MAXPATHLEN, "%s%s", rootfs->mount,
aux + strlen(rootfs->path));
ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type,
mntflags, mntdata); mntflags, mntdata);
out:
free(mntdata); free(mntdata);
return ret; return ret;
} }
@ -1030,7 +1034,7 @@ static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
continue; continue;
} }
if (mount_entry_on_absolute_rootfs(mntent, rootfs->path)) if (mount_entry_on_absolute_rootfs(mntent, rootfs))
goto out; goto out;
} }