[patch] Patch to functionally revert df33ecdd

revert-df33ecdd.patch (text/plain), 1.49 KB, created by eroen on 2013-01-13 23:31:07 UTC

revert df33ecdd

From: eroen <[e-mail]>

mount fuse's meminfo file to container's /proc/meminfo

we already have virtualize meminfo for container through fuse filesystem,
add function lxcContainerMountProcFuse to mount this meminfo file to
the container's /proc/meminfo.

So we can isolate container's /proc/meminfo from host now.

Signed-off-by: Gao feng <[e-mail]>
---
 src/lxc/lxc_container.c |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 9f22923..4cf328d 100644
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -1950,10 +1950,6 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
     if (lxcContainerMountBasicFS(true, sec_mount_options) < 0)
         goto cleanup;
 
-    /* Mounts /proc/meminfo etc sysinfo */
-    if (lxcContainerMountProcFuse(vmDef, "/.oldroot") < 0)
-        goto cleanup;
-
     /* Now we can re-mount the cgroups controllers in the
      * same configuration as before */
     if (lxcContainerMountCGroups(mounts, nmounts,
@@ -2058,10 +2054,6 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef,
     if (lxcContainerMountBasicFS(false, sec_mount_options) < 0)
         goto cleanup;
 
-    /* Mounts /proc/meminfo etc sysinfo */
-    if (lxcContainerMountProcFuse(vmDef, NULL) < 0)
-        goto cleanup;
-
     /* Now we can re-mount the cgroups controllers in the
      * same configuration as before */
     if (lxcContainerMountCGroups(mounts, nmounts,