From d2111444dddddb706c29e4f2f46047dfca8c59ce Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Thu, 27 Aug 2015 15:25:08 -0400 Subject: [PATCH] init: Support older apparmor MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- config/init/systemd/lxc-apparmor-load | 4 +++- config/init/upstart/lxc.conf | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 -- 2.47.2