Skip to content

Commit

Permalink
security: change link order of LSMs so security=tomoyo works
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
James Morris committed Feb 12, 2009
1 parent d74db3b commit 42d5aaa
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion security/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ obj-$(CONFIG_SECURITYFS) += inode.o
# Must precede capability.o in order to stack properly.
obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o
obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o
obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o

# Object integrity file lists
subdir-$(CONFIG_IMA) += integrity/ima
Expand Down

0 comments on commit 42d5aaa

Please sign in to comment.