[libvirt] [RFC PATCH 3/6] LXC: only mount cgroupfs when userns is disabled

[Daniel P. Berrange]

On Mon, Mar 11, 2013 at 02:26:49PM +0800, Gao feng wrote:
> Since we can't mount cgroupfs in uninit user namespace
> now. only mount cgroupfs when userns is disabled.
> 
> Signed-off-by: Gao feng <gaofeng at cn.fujitsu.com>
> ---
>  src/lxc/lxc_container.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 5c66ae3..92af3e5 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -1979,7 +1979,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
>  
>      /* Now we can re-mount the cgroups controllers in the
>       * same configuration as before */
> -    if (lxcContainerMountCGroups(mounts, nmounts,
> +    if (vmDef->os.userns != VIR_DOMAIN_USER_NS_ENABLED &&
> +        lxcContainerMountCGroups(mounts, nmounts,
>                                   cgroupRoot, sec_mount_options) < 0)
>          goto cleanup;
>  
> @@ -2087,7 +2088,8 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef,
>  
>      /* Now we can re-mount the cgroups controllers in the
>       * same configuration as before */
> -    if (lxcContainerMountCGroups(mounts, nmounts,
> +    if (vmDef->os.userns != VIR_DOMAIN_USER_NS_ENABLED &&
> +        lxcContainerMountCGroups(mounts, nmounts,
>                                   cgroupRoot, sec_mount_options) < 0)
>          goto cleanup;

I'm not sure that this is the right approach for this. If we can't mount
the cgroups filesystems, then we need preserve the existing mounts from
the host in some way, rather than unmounting them.

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|