From 24dd3146e17294cab81bc1e79baed2298de1e15a Mon Sep 17 00:00:00 2001
From: Tom Cherry <tomcherry@google.com>
Date: Mon, 4 Nov 2019 15:17:17 -0800
Subject: [PATCH] Move init and ueventd scripts from / to /system/etc

There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot + boot to recovery
Merged-In: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
Change-Id: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
---
 Android.bp  | 10 ++++++++++
 etc/init.rc |  9 ---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Android.bp b/Android.bp
index 45aafb04..d78c3fa9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,6 +94,14 @@ cc_library_static {
     ],
 }
 
+prebuilt_etc {
+    name: "init_recovery.rc",
+    filename: "init.rc",
+    src: "etc/init.rc",
+    sub_dir: "init/hw",
+    recovery: true,
+}
+
 cc_binary {
     name: "recovery",
     recovery: true,
@@ -119,11 +127,13 @@ cc_binary {
 
     required: [
         "e2fsdroid.recovery",
+        "init_recovery.rc",
         "librecovery_ui_ext",
         "minadbd",
         "mke2fs.conf.recovery",
         "mke2fs.recovery",
         "recovery_deps",
+        "ueventd.rc.recovery",
     ],
 }
 
diff --git a/etc/init.rc b/etc/init.rc
index d5b056ae..c54de5af 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -44,10 +44,6 @@ on boot
 
     class_start default
 
-# Load properties from /system/ + /factory after fs mount.
-on load_system_props_action
-    load_system_props
-
 on firmware_mounts_complete
    rm /dev/.booting
 
@@ -58,11 +54,6 @@ on late-init
     trigger post-fs
     trigger post-fs-data
 
-    # Load properties from /system/ + /factory after fs mount. Place
-    # this in another action so that the load will be scheduled after the prior
-    # issued fs triggers have completed.
-    trigger load_system_props_action
-
     # Remove a file to wake up anything waiting for firmware
     trigger firmware_mounts_complete