summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiley Andrews <riandrews@google.com>2014-07-15 20:39:41 -0700
committerRiley Andrews <riandrews@google.com>2014-07-16 03:59:53 +0000
commitd721f5fc21855fdf7dd36ff1ec8f9b46f6cc33d6 (patch)
tree79c2787cf92c6e97fc9567cbd25e0080dbbf727b
parenta94abb8481b98adb5fdc456dd3892f7f9d220094 (diff)
downloadsystem_core-d721f5fc21855fdf7dd36ff1ec8f9b46f6cc33d6.tar.gz
system_core-d721f5fc21855fdf7dd36ff1ec8f9b46f6cc33d6.tar.bz2
system_core-d721f5fc21855fdf7dd36ff1ec8f9b46f6cc33d6.zip
Remove the /dev/.booting file before triggering boot.
On mako only, there is a race condition such that core + main services must be started after releasing ueventd (by removing /dev/.booting). bug 16304711 bug 16333352
-rw-r--r--rootdir/init.rc5
1 files changed, 3 insertions, 2 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 2c967cc88..364421918 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -180,11 +180,12 @@ on late-init
# issued fs triggers have completed.
trigger load_all_props_action
+ # Remove a file to wake up anything waiting for firmware.
+ trigger firmware_mounts_complete
+
trigger early-boot
trigger boot
- # Remove a file to wake up anything waiting for firmware
- trigger firmware_mounts_complete
on post-fs
# once everything is setup, no need to modify /