[lxc-devel] [PATCH] make mountcgroups hook to lxc.include aware (v2)

[Serge Hallyn]

Quoting S.Çağlar Onur (caglar at 10ur.org):
> [resending the patch from correct branch]
> 
> commit 09ad624693cb0ef41cf246e2876b5f356783b34d introduced lxc.include option
> to include other config files. This patch uses it in mountcgroups hook otherwise
> lxc-start fails with following error message for the nested containers;
> 
> root at oOo:/var/lib/lxc/raring# lxc-start -l debug -o l -n raring -d
> lxc-start: command get_cgroup failed to receive response
> 
> Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>

Alas this won't handled lxc.include from a lxc.include'd file, but I
don't think we do that yet :)

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  hooks/mountcgroups | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hooks/mountcgroups b/hooks/mountcgroups
> index a63c8db..073929c 100755
> --- a/hooks/mountcgroups
> +++ b/hooks/mountcgroups
> @@ -43,7 +43,9 @@ do_devices_setup() {
>      local line
>      local w  # which (allow or deny)
>      local v  # value
> -    egrep "^lxc.cgroup.devices.(allow|deny)[ \t]*=" ${configfile} | while read line; do
> +    # lxc.include provides common configuration options
> +    local commonconfigfile=$(egrep "^lxc.include[ \t]*=" ${configfile} | awk -F= '{ print $2 }')
> +    cat ${configfile} ${commonconfigfile} | egrep "^lxc.cgroup.devices.(allow|deny)[ \t]*=" | while read line; do
>          w=`echo $line | awk -F. '{ print $4 }' | awk '{ print $1 }'`
>          v=`echo $line | awk -F= '{ print $2 }'`
>          echo "$v" >> "$devdir"/devices.$w
> -- 
> 1.8.3.2
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel