init: Support older apparmor

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

diff --git a/config/init/systemd/lxc-apparmor-load b/config/init/systemd/lxc-apparmor-load
index 619cd5324a756ceb67eb7cfd908115d47ece437b..abca581e870baf69e36e3cfa31c42f4c83417817 100755 (executable)
--- a/config/init/systemd/lxc-apparmor-load
+++ b/config/init/systemd/lxc-apparmor-load
@@ -9,6 +9,8 @@ if [ -f $SYSF ]; then
        if [ -x /lib/apparmor/profile-load ]; then
                /lib/apparmor/profile-load usr.bin.lxc-start
                /lib/apparmor/profile-load lxc-containers
+       elif [ -x /lib/init/apparmor-profile-load ]; then
+               /lib/init/apparmor-profile-load usr.bin.lxc-start
+               /lib/init/apparmor-profile-load lxc-containers
        fi
 fi
-

diff --git a/config/init/upstart/lxc.conf b/config/init/upstart/lxc.conf
index ff21137b9e0b0d21e31bedb3e83e76e6941d62ff..437db3ce5f1df3b46d5e264c96a3898baba93c3c 100644 (file)
--- a/config/init/upstart/lxc.conf
+++ b/config/init/upstart/lxc.conf
@@ -39,6 +39,9 @@ pre-start script
                if [ -x /lib/apparmor/profile-load ]; then
                        /lib/apparmor/profile-load usr.bin.lxc-start
                        /lib/apparmor/profile-load lxc-containers
+               elif [ -x /lib/init/apparmor-profile-load ]; then
+                       /lib/init/apparmor-profile-load usr.bin.lxc-start
+                       /lib/init/apparmor-profile-load lxc-containers
                fi
        fi