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

Commit c7f0f603 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 31712bea: Move filesystem mounting into a new "fs" init level

parents d7faeab5 31712bea

init/init.c

+3 −0
Original line number Diff line number Diff line
@@ -929,6 +929,9 @@ int main(int argc, char **argv) 


        /* execute all the boot actions to get us started */

    action_for_each_trigger("init", action_add_queue_tail);

    action_for_each_trigger("early-fs", action_add_queue_tail);

    action_for_each_trigger("fs", action_add_queue_tail);

    action_for_each_trigger("post-fs", action_add_queue_tail);

    drain_action_queue();



        /* read any property files on system or data and

rootdir/init.rc

+4 −2
Original line number Diff line number Diff line
@@ -80,13 +80,16 @@ loglevel 3 
    # 5.0 %

    write /dev/cpuctl/bg_non_interactive/cpu.shares 52



on fs

# mount mtd partitions

    # Mount /system rw first to give the filesystem a chance to save a checkpoint

    mount yaffs2 mtd@system /system

    mount yaffs2 mtd@system /system ro remount

    mount yaffs2 mtd@userdata /data nosuid nodev

    mount yaffs2 mtd@cache /cache nosuid nodev



on post-fs

    # We chown/chmod /data again so because mount is run as root + defaults

    mount yaffs2 mtd@userdata /data nosuid nodev

    chown system system /data

    chmod 0771 /data
@@ -110,7 +113,6 @@ loglevel 3 
    write /proc/apanic_console 1



    # Same reason as /data above

    mount yaffs2 mtd@cache /cache nosuid nodev

    chown system cache /cache

    chmod 0770 /cache