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>

diff --git a/src/tests/lxc-test-ubuntu b/src/tests/lxc-test-ubuntu
index c6573c11221d55afff6e68a375144f58ef3b5ab9..7fa1c890fba2efbf1542ebdad733f214e15157cf 100755 (executable)
--- 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