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
This commit is contained in:
+10
@@ -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 {
|
cc_binary {
|
||||||
name: "recovery",
|
name: "recovery",
|
||||||
recovery: true,
|
recovery: true,
|
||||||
@@ -119,11 +127,13 @@ cc_binary {
|
|||||||
|
|
||||||
required: [
|
required: [
|
||||||
"e2fsdroid.recovery",
|
"e2fsdroid.recovery",
|
||||||
|
"init_recovery.rc",
|
||||||
"librecovery_ui_ext",
|
"librecovery_ui_ext",
|
||||||
"minadbd",
|
"minadbd",
|
||||||
"mke2fs.conf.recovery",
|
"mke2fs.conf.recovery",
|
||||||
"mke2fs.recovery",
|
"mke2fs.recovery",
|
||||||
"recovery_deps",
|
"recovery_deps",
|
||||||
|
"ueventd.rc.recovery",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,10 +44,6 @@ on boot
|
|||||||
|
|
||||||
class_start default
|
class_start default
|
||||||
|
|
||||||
# Load properties from /system/ + /factory after fs mount.
|
|
||||||
on load_system_props_action
|
|
||||||
load_system_props
|
|
||||||
|
|
||||||
on firmware_mounts_complete
|
on firmware_mounts_complete
|
||||||
rm /dev/.booting
|
rm /dev/.booting
|
||||||
|
|
||||||
@@ -58,11 +54,6 @@ on late-init
|
|||||||
trigger post-fs
|
trigger post-fs
|
||||||
trigger post-fs-data
|
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
|
# Remove a file to wake up anything waiting for firmware
|
||||||
trigger firmware_mounts_complete
|
trigger firmware_mounts_complete
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user