summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2015-06-03 14:19:29 -0700
committerPaul Lawrence <paullawrence@google.com>2015-06-03 14:19:29 -0700
commit37fcc5d73ebf31b193cda41731a5a9dcb8206473 (patch)
tree7ce0bfd57cc0974d8c1f564de97fa773053376d1 /rootdir
parentc6d5cd18f86aa78b769ba06e43963231f05bc809 (diff)
downloadsystem_core-37fcc5d73ebf31b193cda41731a5a9dcb8206473.zip
system_core-37fcc5d73ebf31b193cda41731a5a9dcb8206473.tar.gz
system_core-37fcc5d73ebf31b193cda41731a5a9dcb8206473.tar.bz2
Move crypt commands to a different listener in vold
In order to prevent this bug from happening, we must allow vold cryptfs commands to complete while a long running mount is underway. While waiting for vold to be changed to a binder interface, we will simply create two listeners, one for cryptfs and one for everything else. Bug: 19197175 Change-Id: Ie3d9567819ced7757b0a8f391547f27db944153c
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc1
1 files changed, 1 insertions, 0 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index a3cf6f1..f1c0a01 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -546,6 +546,7 @@ service vold /system/bin/vold \
--fsck_context=u:r:fsck:s0 --fsck_untrusted_context=u:r:fsck_untrusted:s0
class core
socket vold stream 0660 root mount
+ socket cryptd stream 0660 root mount
ioprio be 2
service netd /system/bin/netd