[lxc-devel] [PATCH 1/1] lxc-test-ubuntu: improve apparmor policy test

[Stéphane Graber]

On Fri, Oct 18, 2013 at 10:43:24AM -0500, Serge Hallyn wrote:
> Also allow the standard non-nested apparmor policy.
> 
> Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  src/tests/lxc-test-ubuntu | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/tests/lxc-test-ubuntu b/src/tests/lxc-test-ubuntu
> index c6573c1..7fa1c89 100755
> --- a/src/tests/lxc-test-ubuntu
> +++ b/src/tests/lxc-test-ubuntu
> @@ -68,7 +68,7 @@ for template in ubuntu ubuntu-cloud; do
>  	# Check apparmor
>  	lxcpid=`lxc-info -n $name -p | awk -F: '{ print $2 }' | awk '{ print $1}'`
>  	aa=`cat /proc/$lxcpid/attr/current`
> -	if [ "$aa" != "lxc-container-default-with-nesting (enforce)" ]; then
> +	if [ "$aa" != "lxc-container-default-with-nesting (enforce)" -a "$aa" != "lxc-container-default (enforce)" ]; then
>  		FAIL " to correctly set apparmor profile (profile is \"$aa\")"
>  	fi
>  	lxc-stop -n $name
> -- 
> 1.8.3.2
> 
> 
> ------------------------------------------------------------------------------
> October Webinars: Code for Performance
> Free Intel webinars can help you accelerate application performance.
> Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from 
> the latest Intel processors and coprocessors. See abstracts and register >
> http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20131018/80b88d9c/attachment.pgp>