Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 154f7e9b authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "Move init and ueventd scripts from / to /system/etc"

parents 405f4d35 bcd3f354

Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -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",

    ],

}

etc/init.rc

+0 −9
Original line number Diff line number Diff line
@@ -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