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

mindless changes to conform indentation

Browse Source 
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Daniel Lezcano 2011-01-13 16:15:15 +01:00 committed by Daniel Lezcano
parent 8edcba11e9
commit d330fe7b86
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lxc/conf.c
View File

@ -923,6 +923,7 @@ static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
mntflags = 0; mntflags = 0;
mntdata = NULL; mntdata = NULL;
if (parse_mntopts(mntent, &mntflags, &mntdata) < 0) { if (parse_mntopts(mntent, &mntflags, &mntdata) < 0) {
ERROR("failed to parse mount option '%s'", ERROR("failed to parse mount option '%s'",
mntent->mnt_opts); mntent->mnt_opts);
@ -932,30 +933,33 @@ static int mount_file_entries(const struct lxc_rootfs *rootfs, FILE *file)
/* now figure out where to mount it to. */ /* now figure out where to mount it to. */
mntdir = mntent->mnt_dir; mntdir = mntent->mnt_dir;
mntroot = NULL; mntroot = NULL;
if (!rootfs->path) { if (!rootfs->path) {
/* if we use system root fs, /* if we use system root fs, the mount is relative to '/'
* the mount is relative to / and can be absolute */ * and can be absolute */
if (mntdir[0] != '/') if (mntdir[0] != '/')
mntroot = ""; /* this is "/" */ mntroot = ""; /* this is '/' */
} } else {
else {
/* else we have a separate root, mounts are /* else we have a separate root, mounts are
* relative to it, and absolute paths are risky */ * relative to it, and absolute paths are risky */
if (mntdir[0] != '/') if (mntdir[0] != '/')
/* relative too root mount point */ /* relative to root mount point */
mntroot = rootfs->mount; mntroot = rootfs->mount;
else if (strncmp(mntdir, rootfs->mount, strlen(rootfs->mount))) else if (strncmp(mntdir, rootfs->mount,
WARN("mount target directory '%s' is outside container root", strlen(rootfs->mount)))
mntdir); WARN("mount target directory '%s' is outside "
"container root", mntdir);
else else
WARN("mount target directory '%s' is not relative to container root", WARN("mount target directory '%s' is not "
mntdir); "relative to container root", mntdir);
} }
if (mntroot) { if (mntroot) {
/* make it relative to mntroot */ /* make it relative to mntroot */
snprintf(path, sizeof(path), "%s/%s", mntroot, mntdir); snprintf(path, sizeof(path), "%s/%s", mntroot, mntdir);
mntdir = path; mntdir = path;
} }
if (mount(mntent->mnt_fsname, mntdir, if (mount(mntent->mnt_fsname, mntdir,
mntent->mnt_type, mntflags & ~MS_REMOUNT, mntdata)) { mntent->mnt_type, mntflags & ~MS_REMOUNT, mntdata)) {
SYSERROR("failed to mount '%s' on '%s'", SYSERROR("failed to mount '%s' on '%s'",