Remove property-based fused sdcard mounting

Depending on the actions pending on the action queue in 'init', the
2nd stage bind mount can fail due to timeout.  The handling of the
1st stage property trigger to start the service, the setting of the
service running property and the 2nd stage bind mount trigger actions
can sometimes run quickly enough that the fuse sdcard process does not
have time to complete the initial fuse mount before the 2nd stage
bind mount fails due to timeout.

Replace the 2-stage startup trigger logic with always enabled fuse
sdcard service.

CRs-Fixed: 569363
Change-Id: I2ef53094c710a9771b0140fe8df880773a5a7f71
This commit is contained in:
David Ng 2013-11-14 21:18:22 -08:00
parent 0cacacd5a2
commit 36f9c52e1d
1 changed files with 0 additions and 11 deletions

View File

@ -282,7 +282,6 @@ service ril-qmi /system/bin/sh /init.qcom.ril.sh
oneshot
on property:vold.decrypt=trigger_restart_framework
setprop ro.fuse_sdcard ${persist.fuse_sdcard}
start qcom-c_main-sh
start config_bluetooth
@ -704,25 +703,15 @@ service profiler_daemon /system/bin/profiler_daemon
service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
class late_start
disabled
service fuse_sdcard /system/bin/sdcard -u 1023 -g 1023 -d /mnt/media_rw/sdcard1 /storage/sdcard1
class late_start
disabled
on property:ro.fuse_sdcard=true
start sdcard
start fuse_sdcard
# Binding fuse mount point to /storage/emulated/legacy
on property:init.svc.sdcard=running
wait /mnt/shell/emulated/0
mount none /mnt/shell/emulated/0 /storage/emulated/legacy bind
# This will make sure that sdcard service starts as late_start.
on nonencrypted
setprop ro.fuse_sdcard ${persist.fuse_sdcard}
service hcidump /system/bin/sh /system/etc/hcidump.sh
user bluetooth
group bluetooth system net_bt_admin net_admin