summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2014-02-26 22:31:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-26 22:31:02 +0000
commite570fd3a32a3a3525a2e6a069d2b69c6184db56e (patch)
treef09dd2d9197270905edbe52e7b17c0e45882a445 /rootdir
parent8dd3ad1281aacdff9b404eb7bc2266131c4dd1ff (diff)
parent9453bce4cff952aab5c90f5b30c6c12d3e1521e5 (diff)
downloadsystem_core-e570fd3a32a3a3525a2e6a069d2b69c6184db56e.zip
system_core-e570fd3a32a3a3525a2e6a069d2b69c6184db56e.tar.gz
system_core-e570fd3a32a3a3525a2e6a069d2b69c6184db56e.tar.bz2
am 9453bce4: Merge "Apply restorecon_recursive to all of /data."
* commit '9453bce4cff952aab5c90f5b30c6c12d3e1521e5': Apply restorecon_recursive to all of /data.
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc11
1 files changed, 3 insertions, 8 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b2fa751..7d15132 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -223,23 +223,16 @@ on post-fs-data
mkdir /data/misc/radio 0770 system radio
mkdir /data/misc/sms 0770 system radio
mkdir /data/misc/zoneinfo 0775 system system
- restorecon_recursive /data/misc/zoneinfo
mkdir /data/misc/vpn 0770 system vpn
mkdir /data/misc/systemkeys 0700 system system
mkdir /data/misc/wifi 0770 wifi wifi
mkdir /data/misc/wifi/sockets 0770 wifi wifi
- restorecon_recursive /data/misc/wifi/sockets
mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
mkdir /data/misc/dhcp 0770 dhcp dhcp
# give system access to wpa_supplicant.conf for backup and restore
chmod 0660 /data/misc/wifi/wpa_supplicant.conf
mkdir /data/local 0751 root root
mkdir /data/misc/media 0700 media media
- restorecon_recursive /data/misc/media
-
- # Set security context of any pre-existing /data/misc/adb/adb_keys file.
- restorecon /data/misc/adb
- restorecon /data/misc/adb/adb_keys
# For security reasons, /data/local/tmp should always be empty.
# Do not place files or directories in /data/local/tmp
@@ -271,7 +264,6 @@ on post-fs-data
# create directory for MediaDrm plug-ins - give drm the read/write access to
# the following directory.
mkdir /data/mediadrm 0770 mediadrm mediadrm
- restorecon_recursive /data/mediadrm
# symlink to bugreport storage location
symlink /data/data/com.android.shell/files/bugreports /data/bugreports
@@ -282,6 +274,9 @@ on post-fs-data
# Reload policy from /data/security if present.
setprop selinux.reload_policy 1
+ # Set SELinux security contexts on upgrade or policy update.
+ restorecon_recursive /data
+
# If there is no fs-post-data action in the init.<device>.rc file, you
# must uncomment this line, otherwise encrypted filesystems
# won't work.