Skip to content

L
lxc
Commit b1789442 by Daniel Lezcano Committed by Daniel Lezcano
Options

use defined rootfs mount point

As we defined a path where to mount the rootfs, we can use without ambiguity because it is defined by default at compile time or by the configuration. Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 23b7ea69
Showing with 14 additions and 5 deletions
src/lxc/conf.c
......@@ -582,19 +582,28 @@ static int setup_rootfs_pivot_root(const char *rootfs, const char *pivotdir)
static int setup_rootfs(const struct lxc_rootfs *rootfs)
{
const char *tmpfs = "/tmp";
char *mpath = LXCROOTFSMOUNT;
if (!rootfs->path)
return 0;
if (mount(rootfs->path, tmpfs, "none", MS_BIND|MS_REC, NULL)) {
SYSERROR("failed to mount '%s'->'%s'", rootfs->path, "/tmp");
if (rootfs->mount)
mpath = rootfs->mount;
if (access(mpath, F_OK)) {
SYSERROR("failed to access to '%s', check it is present",
mpath);
return -1;
}
if (mount(rootfs->path, mpath, "none", MS_BIND|MS_REC, NULL)) {
SYSERROR("failed to mount '%s'->'%s'", rootfs->path, mpath);
return -1;
}
DEBUG("mounted '%s' on '%s'", rootfs->path, tmpfs);
DEBUG("mounted '%s' on '%s'", rootfs->path, mpath);
if (setup_rootfs_pivot_root(tmpfs, rootfs->pivot)) {
if (setup_rootfs_pivot_root(mpath, rootfs->pivot)) {
ERROR("failed to pivot_root to '%s'", rootfs->pivot);
return -1;
}
......
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