Skip to content

L
lxc
Commit 54c23a6a by Serge Hallyn
Options

Merge pull request #512 from martinpitt/master

Call /lib/apparmor/profile-load directly instead of the wrapper
parents 44481bff 580f58c7
Showing with 6 additions and 6 deletions
config/init/systemd/lxc-apparmor-load
......@@ -6,9 +6,9 @@ set -eu
# don't load profiles if mount mediation is not supported
SYSF=/sys/kernel/security/apparmor/features/mount/mask
if [ -f $SYSF ]; then
if [ -x /lib/init/apparmor-profile-load ]; then
/lib/init/apparmor-profile-load usr.bin.lxc-start
/lib/init/apparmor-profile-load lxc-containers
if [ -x /lib/apparmor/profile-load ]; then
/lib/apparmor/profile-load usr.bin.lxc-start
/lib/apparmor/profile-load lxc-containers
fi
fi
config/init/upstart/lxc.conf
......@@ -36,9 +36,9 @@ pre-start script
# don't load profiles if mount mediation is not supported
SYSF=/sys/kernel/security/apparmor/features/mount/mask
if [ -f $SYSF ]; then
if [ -x /lib/init/apparmor-profile-load ]; then
/lib/init/apparmor-profile-load usr.bin.lxc-start
/lib/init/apparmor-profile-load lxc-containers
if [ -x /lib/apparmor/profile-load ]; then
/lib/apparmor/profile-load usr.bin.lxc-start
/lib/apparmor/profile-load lxc-containers
fi
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment