From 9eb8c8bdbe4965e9a92d83882e97cf67aee20821 Mon Sep 17 00:00:00 2001
From: JP Abgrall <jpa@google.com>
Date: Mon, 20 Oct 2014 20:02:57 -0700
Subject: 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
---
 etc/init.rc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'etc/init.rc')

diff --git a/etc/init.rc b/etc/init.rc
index 1b402e20d..c654eedb8 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
 
-- 
cgit v1.2.3


From 5bf74b238b402eaaf8c5bd1663fe4d592e59421f Mon Sep 17 00:00:00 2001
From: Jesse Zhao <jessezhao@google.com>
Date: Thu, 8 Jan 2015 15:59:23 -0800
Subject: Bump up max_map_count value.

Change-Id: Id3e2c0795b817db9a85bc84cba2aa05d20179d39
Bug: 18503789
---
 etc/init.rc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'etc/init.rc')

diff --git a/etc/init.rc b/etc/init.rc
index c654eedb8..c78a44a2a 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -30,6 +30,7 @@ on init
     chmod 0775 /tmp
 
     write /proc/sys/kernel/panic_on_oops 1
+    write /proc/sys/vm/max_map_count 1000000
 
 on fs
     mkdir /dev/usb-ffs 0770 shell shell
-- 
cgit v1.2.3