commit 2d794f0be65472c2d0a6266c23723126d4dcdd1d
author Tom Cherry <tomcherry@google.com> Mon Nov 04 10:43:14 2019 -0800
committer Tom Cherry <tomcherry@google.com> Thu Nov 07 10:53:54 2019 -0800
tree 047ec596f5216051303d52923cf1bb88f7a078ea
parent 466a158851a0e8e6119ebd8a30012c7c5e595398

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
Merged-In: I020772acf701e1adc1e5fdd154b3fbf0a30f0e11
Change-Id: I020772acf701e1adc1e5fdd154b3fbf0a30f0e11

qemu_trusty_base.mk

diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk
index 65f8f0e..ed8d802 100644
--- a/qemu_trusty_base.mk
+++ b/qemu_trusty_base.mk
@@ -30,11 +30,9 @@
     dhcpclient \
     gatekeeperd \
     hwservicemanager \
-    init \
     init_system \
     init_vendor \
     init.environ.rc \
-    init.rc \
     libc.bootstrap \
     libdl.bootstrap \
     libm.bootstrap \
@@ -68,9 +66,8 @@
     toybox \
 
 PRODUCT_COPY_FILES += \
-    system/core/rootdir/init.usb.rc:root/init.usb.rc \
-    system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \
-    system/core/rootdir/ueventd.rc:root/ueventd.rc \
+    system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \
+    system/core/rootdir/init.usb.configfs.rc:system/etc/init/hw/init.usb.configfs.rc \
     system/core/rootdir/etc/hosts:system/etc/hosts \
 
 PRODUCT_FULL_TREBLE_OVERRIDE := true