summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorgcondra@google.com <gcondra@google.com>2013-05-20 16:35:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-20 16:35:33 -0700
commit9a8cb3abf8985586172d8f891933b04ff419f81c (patch)
treecb4b74f4298e801761057e6f590dba8fa2af5350 /rootdir
parenta9228942f0a6291e2721729ddf9a28f2318683e0 (diff)
parentb9866649e24d7b6eedcaf2e03ffc605a3417537d (diff)
downloadsystem_core-9a8cb3abf8985586172d8f891933b04ff419f81c.zip
system_core-9a8cb3abf8985586172d8f891933b04ff419f81c.tar.gz
system_core-9a8cb3abf8985586172d8f891933b04ff419f81c.tar.bz2
am b9866649: am 52351300: Revert "Add a version check for SELinux policy on device."
* commit 'b9866649e24d7b6eedcaf2e03ffc605a3417537d': 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 05c16e3..03877b4 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