init: Support older apparmor

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
lxc · Aug 27, 2015 · 5d46645 · 5d46645
1 parent 307e830
commit 5d46645
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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