summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorgcondra@google.com <gcondra@google.com>2013-05-20 15:52:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-20 15:52:26 -0700
commitb9866649e24d7b6eedcaf2e03ffc605a3417537d (patch)
tree887c60ceb3315fe6ac5bfad6028d0e16feec6da4 /rootdir
parent19ec15b247523ec8b0c6651e01bf746674d424d1 (diff)
parent52351300d156826bf22c493828571f45a1cea16a (diff)
downloadsystem_core-b9866649e24d7b6eedcaf2e03ffc605a3417537d.zip
system_core-b9866649e24d7b6eedcaf2e03ffc605a3417537d.tar.gz
system_core-b9866649e24d7b6eedcaf2e03ffc605a3417537d.tar.bz2
am 52351300: Revert "Add a version check for SELinux policy on device."
* commit '52351300d156826bf22c493828571f45a1cea16a': Revert "Add a version check for SELinux policy on device."
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc6
1 files changed, 3 insertions, 3 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index f887a26..b89708e 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -177,6 +177,9 @@ on post-fs
mkdir /cache/lost+found 0770 root root
on post-fs-data
+ # reload SELinux based on what we find on the data partition
+ selinux_reload_policy
+
# We chown/chmod /data again so because mount is run as root + defaults
chown system system /data
chmod 0771 /data
@@ -260,9 +263,6 @@ on post-fs-data
#setprop vold.post_fs_data_done 1
on boot
-# reload SELinux policy to make sure we use the most up-to-date one
- selinux_reload_policy
-
# basic network init
ifup lo
hostname localhost