lxc-test-ubuntu: also allow the standard non-nested apparmor policy

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lxc-test-ubuntu: also allow the standard non-nested apparmor policy
3ca91fb6 · Serge Hallyn · 8daccdb4 · 3ca91fb6
Commit 3ca91fb6 authored Oct 18, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lxc-test-ubuntu src/tests/lxc-test-ubuntu +1 -1

No files found.
--- 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