diff options
author | James Morris <jmorris@namei.org> | 2009-02-12 00:29:04 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-02-12 00:29:04 -0500 |
commit | 42d5aaa2d826f54924e260b58a8e410e59d54163 (patch) | |
tree | 64e3c400671d3adf1ed40f5179e95655400ce1cc /security | |
parent | d74db3b22a75fac474abe711f582ffe25eacce25 (diff) |
security: change link order of LSMs so security=tomoyo works
LSMs need to be linked before root_plug to ensure the security=
boot parameter works with them. Do this for Tomoyo.
(root_plug probably needs to be taken out and shot at some point,
too).
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r-- | security/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile index 35f50c585e2b..fa77021d9778 100644 --- a/security/Makefile +++ b/security/Makefile | |||
@@ -16,9 +16,9 @@ obj-$(CONFIG_SECURITYFS) += inode.o | |||
16 | # Must precede capability.o in order to stack properly. | 16 | # Must precede capability.o in order to stack properly. |
17 | obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o | 17 | obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o |
18 | obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o | 18 | obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o |
19 | obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o | ||
19 | obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o | 20 | obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o |
20 | obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o | 21 | obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o |
21 | obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o | ||
22 | 22 | ||
23 | # Object integrity file lists | 23 | # Object integrity file lists |
24 | subdir-$(CONFIG_IMA) += integrity/ima | 24 | subdir-$(CONFIG_IMA) += integrity/ima |