[lxc-devel] [PATCH] init: Support older apparmor

Stéphane Graber stgraber at ubuntu.com
Thu Aug 27 19:25:08 UTC 2015


Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 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 619cd53..abca581 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 ff21137..437db3c 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
 
-- 
1.9.1



More information about the lxc-devel mailing list