From 3ca91fb6f4e648f210096765002404e2d8116c8e Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Fri, 18 Oct 2013 10:42:14 -0500 Subject: [PATCH] lxc-test-ubuntu: also allow the standard non-nested apparmor policy MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- 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 c6573c112..7fa1c890f 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 -- 2.47.2