From cb22b13418b73d6d7b55e28a017348fecf8b6e98 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 12 Nov 2021 20:27:15 -0800
Subject: Mount binderfs and add /dev/binder in recovery.

Test: recovery mode
Bug: 170338625
Change-Id: I6c64039b4139a48f739a62e15a26e624566d252c
---
 etc/init.rc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/etc/init.rc b/etc/init.rc
index 5cacb8bdb..983d91aa4 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -38,6 +38,14 @@ on init
     write /proc/sys/kernel/panic_on_oops 1
     write /proc/sys/vm/max_map_count 1000000
 
+    # Mount binderfs
+    mkdir /dev/binderfs
+    mount binder binder /dev/binderfs stats=global
+    chmod 0755 /dev/binderfs
+
+    symlink /dev/binderfs/binder /dev/binder
+    chmod 0666 /dev/binderfs/binder
+
 on boot
     ifup lo
     hostname localhost
-- 
cgit v1.2.3


From 87980990584d3daf180fe7822abbdf7e942b5c7c Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Fri, 12 Nov 2021 20:04:14 -0800
Subject: Start servicemanager on init in recovery mode.

This aligns with the behavior in normal boot,
where servicemanager is started on init.

Test: manual in recovery mode
Bug: 170338625
Change-Id: I91d322da9f6eaef21c7ee969375e63751b61513c
---
 etc/init.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/init.rc b/etc/init.rc
index 983d91aa4..4efee3070 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -46,6 +46,9 @@ on init
     symlink /dev/binderfs/binder /dev/binder
     chmod 0666 /dev/binderfs/binder
 
+    # Start essential services
+    start servicemanager
+
 on boot
     ifup lo
     hostname localhost
-- 
cgit v1.2.3


From 0fa170760051245222b43fde9c6a17852ae4ae77 Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Sat, 13 Nov 2021 01:34:16 -0800
Subject: on boot class_start hal

Now that we have HALs in recovery, class_start hal
on boot trigger.

Test: manual
Bug: 170338625
Change-Id: Ibfaabb3573252b681279cf05bbf07f8776bd9063
---
 etc/init.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/init.rc b/etc/init.rc
index 4efee3070..e4afecff6 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -55,6 +55,7 @@ on boot
     domainname localdomain
 
     class_start default
+    class_start hal
 
 on firmware_mounts_complete
    rm /dev/.booting
-- 
cgit v1.2.3