NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

LXC: umount the temporary filesystem created by libvirt

Browse Source 
The devpts, dev and fuse filesystems are mounted temporarily.
there is no need to export them to container if container shares
the root directory with host.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
This commit is contained in:
Gao feng 2013-09-11 16:07:53 +08:00 committed by Daniel P. Berrange
parent fd72440a35
commit 4142bf46b8
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/lxc_container.c
View File

@ -1486,6 +1486,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
int ret = -1; int ret = -1;
char *sec_mount_options; char *sec_mount_options;
char *stateDir = NULL; char *stateDir = NULL;
char *tmp = NULL;
VIR_DEBUG("Setup pivot root"); VIR_DEBUG("Setup pivot root");
@ -1522,6 +1523,26 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
goto cleanup; goto cleanup;
#endif #endif
/* These filesystems are created by libvirt temporarily, they
* shouldn't appear in container. */
if (STREQ(root->src, "/")) {
if (virAsprintf(&tmp, "%s/%s.dev", stateDir, vmDef->name) < 0 ||
lxcContainerUnmountSubtree(tmp, false) < 0)
goto cleanup;
VIR_FREE(tmp);
if (virAsprintf(&tmp, "%s/%s.devpts", stateDir, vmDef->name) < 0 ||
lxcContainerUnmountSubtree(tmp, false) < 0)
goto cleanup;
#if WITH_FUSE
VIR_FREE(tmp);
if (virAsprintf(&tmp, "%s/%s.fuse", stateDir, vmDef->name) < 0 ||
lxcContainerUnmountSubtree(tmp, false) < 0)
goto cleanup;
#endif
}
/* If we have the root source being '/', then we need to /* If we have the root source being '/', then we need to
* get rid of any existing stuff under /proc, /sys & /tmp. * get rid of any existing stuff under /proc, /sys & /tmp.
* We need new namespace aware versions of those. We must * We need new namespace aware versions of those. We must
@ -1571,6 +1592,7 @@ cleanup:
VIR_FREE(stateDir); VIR_FREE(stateDir);
virCgroupFree(&cgroup); virCgroupFree(&cgroup);
VIR_FREE(sec_mount_options); VIR_FREE(sec_mount_options);
VIR_FREE(tmp);
return ret; return ret;
} }