summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorgcondra@google.com <gcondra@google.com>2013-05-14 23:45:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-14 23:45:59 -0700
commite45710f19f3843dd0ec02d1a5c7f679f34a33846 (patch)
tree799cd495739859a00197c001fcf74ecd1b717de5 /rootdir
parent9186d8502194e4b6439df6b117d59d629bf63a74 (diff)
parent5a98566d589408c78e35f4476f478a2fa1c13e78 (diff)
downloadsystem_core-e45710f19f3843dd0ec02d1a5c7f679f34a33846.tar.gz
system_core-e45710f19f3843dd0ec02d1a5c7f679f34a33846.tar.bz2
system_core-e45710f19f3843dd0ec02d1a5c7f679f34a33846.zip
am 5a98566d: am 921be8b6: Add a version check for SELinux policy on device.
* commit '5a98566d589408c78e35f4476f478a2fa1c13e78': 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 03877b434..05c16e3d9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -177,9 +177,6 @@ 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
@@ -263,6 +260,9 @@ 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