aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-10-20 20:02:57 -0700
committerJP Abgrall <jpa@google.com>2014-10-20 20:02:57 -0700
commit9eb8c8bdbe4965e9a92d83882e97cf67aee20821 (patch)
tree5af20b7f7ad9fd021444f644eb707184c7884f15
parentd83e4f15890ac6ebe0d61924bd224eb1ae8565ad (diff)
downloadbootable_recovery-9eb8c8bdbe4965e9a92d83882e97cf67aee20821.zip
bootable_recovery-9eb8c8bdbe4965e9a92d83882e97cf67aee20821.tar.gz
bootable_recovery-9eb8c8bdbe4965e9a92d83882e97cf67aee20821.tar.bz2
init.rc: Inidicate that booting is complete wrt firwmare requests
ueventd will wait for /dev/.booting to go away before giving up on loading firmware. The issue was introduced in Ifdd5dd1e95d7e064dde5c80b70198882d949a710 which forgot to update recovery's init.rc Bug: 17993625 Change-Id: I91205fe6eea50aaef9b401d650ec8d6843a92a57
-rw-r--r--etc/init.rc7
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/init.rc b/etc/init.rc
index 1b402e2..c654eed 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -45,7 +45,6 @@ on fs
write /sys/class/android_usb/android0/iProduct ${ro.product.model}
write /sys/class/android_usb/android0/iSerial ${ro.serialno}
-
on boot
ifup lo
hostname localhost
@@ -57,6 +56,9 @@ on boot
on load_all_props_action
load_all_props
+on firmware_mounts_complete
+ rm /dev/.booting
+
# Mount filesystems and start core system services.
on late-init
trigger early-fs
@@ -69,6 +71,9 @@ 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