Merge "Different blkid and fsck execution domains."
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9fad0ed..219a353 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -268,6 +268,7 @@
chmod 0660 /data/misc/wifi/wpa_supplicant.conf
mkdir /data/local 0751 root root
mkdir /data/misc/media 0700 media media
+ mkdir /data/misc/vold 0700 root root
# For security reasons, /data/local/tmp should always be empty.
# Do not place files or directories in /data/local/tmp
@@ -524,7 +525,9 @@
onrestart restart surfaceflinger
onrestart restart drm
-service vold /system/bin/vold
+service vold /system/bin/vold \
+ --blkid_context=u:r:blkid:s0 --blkid_untrusted_context=u:r:blkid_untrusted:s0 \
+ --fsck_context=u:r:fsck:s0 --fsck_untrusted_context=u:r:fsck_untrusted:s0
class core
socket vold stream 0660 root mount
ioprio be 2