From: Stéphane Graber Date: Thu, 27 Aug 2015 19:25:08 +0000 (-0400) Subject: init: Support older apparmor X-Git-Tag: lxc-2.0.0.beta1~188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2111444dddddb706c29e4f2f46047dfca8c59ce;p=thirdparty%2Flxc.git init: Support older apparmor Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- diff --git a/config/init/systemd/lxc-apparmor-load b/config/init/systemd/lxc-apparmor-load index 619cd5324..abca581e8 100755 --- 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 ff21137b9..437db3ce5 100644 --- 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