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

Commit f530c93c authored by Daniel Rosenberg's avatar Daniel Rosenberg
Browse files

Added support for vendor partition and image 



Modified fastboot to flash vendor.img as well. Moved symlink
for /vendor to occur after mounting partitions. Changed mount
to also create the mount point.

Change-Id: I78e1ba24e6bb8b4af96a67ee0569af579439e682
Signed-off-by: default avatarDaniel Rosenberg <drosen@google.com>
parent 929842aa

fastboot/fastboot.c

+5 −2
Original line number Diff line number Diff line
@@ -99,10 +99,11 @@ static struct { 
    char sig_name[13];

    char part_name[9];

    bool is_optional;

} images[4] = {

} images[] = {

    {"boot.img", "boot.sig", "boot", false},

    {"recovery.img", "recovery.sig", "recovery", true},

    {"system.img", "system.sig", "system", false},

    {"vendor.img", "vendor.sig", "vendor", true},

    {"tos.img", "tos.sig", "tos", true},

};
@@ -120,6 +121,8 @@ char *find_item(const char *item, const char *product) 
        fn = "recovery.img";

    } else if(!strcmp(item,"system")) {

        fn = "system.img";

    } else if(!strcmp(item,"vendor")) {

        fn = "vendor.img";

    } else if(!strcmp(item,"tos")) {

        fn = "tos.img";

    } else if(!strcmp(item,"userdata")) {
@@ -287,7 +290,7 @@ void usage(void) 
            "\n"

            "commands:\n"

            "  update <filename>                        reflash device from update.zip\n"

            "  flashall                                 flash boot, system, and if found,\n"

            "  flashall                                 flash boot, system, vendor and if found,\n"

            "                                           recovery, tos\n"

            "  flash <partition> [ <filename> ]         write a file to a flash partition\n"

            "  erase <partition>                        erase a flash partition\n"

fs_mgr/fs_mgr.c

+2 −1
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ static int __mount(const char *source, const char *target, const struct fstab_re 
    int ret;

    int save_errno;

    

    mkdir(target, 0755);

    ret = mount(source, target, rec->fs_type, mountflags, rec->fs_options);

    save_errno = errno;

    INFO("%s(source=%s,target=%s,type=%s)=%d\n", __func__, source, target, rec->fs_type, ret);

rootdir/init.rc

+4 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ on init 
    symlink /system/etc /etc

    symlink /sys/kernel/debug /d



    # Right now vendor lives on the same filesystem as system,

    # but someday that may change.

    symlink /system/vendor /vendor



    # Create cgroup mount point for cpu accounting

    mkdir /acct

    mount cgroup none /acct cpuacct
@@ -184,6 +180,10 @@ on late-init 
    trigger boot



on post-fs

    # Right now vendor lives on the same filesystem as system,

    # but someday that may change. If it has, this symlink will fail.

    symlink /system/vendor /vendor



    # once everything is setup, no need to modify /

    mount rootfs rootfs / ro remount

    # mount shared so changes propagate into child namespaces