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

Commit 409a4472 authored by Luca Stefani's avatar Luca Stefani Committed by Tom Marshall
Browse files

Update f2fs format code 

* Update the code to match ext4
* Add missing arguments to match vold

Change-Id: Ic68e49c31527172b847475b74dc050914a6e4635
parent 9a45e822

roots.cpp

+15 −10
Original line number Diff line number Diff line
@@ -410,17 +410,22 @@ int format_volume(const char* volume, const char* directory) { 
            result = exec_cmd(e2fsdroid_argv[0], const_cast<char**>(e2fsdroid_argv));

          }

        } else {   /* Has to be f2fs because we checked earlier. */

            char *num_sectors = nullptr;

            if (length >= 512 && asprintf(&num_sectors, "%zd", length / 512) <= 0) {

                LOG(ERROR) << "format_volume: failed to create " << v->fs_type

                           << " command for " << v->blk_device;

                return -1;

            }

            const char *f2fs_path = "/sbin/mkfs.f2fs";

            const char* const f2fs_argv[] = {"mkfs.f2fs", "-t", "-d1", v->blk_device, num_sectors, nullptr};

            const char* f2fs_argv[] = { "/sbin/mkfs.f2fs",

                                        "-d1",

                                        "-f",

                                        "-O",

                                        "encrypt",

                                        "-O",

                                        "quota",

                                        v->blk_device,

                                        nullptr,

                                        nullptr };



            result = exec_cmd(f2fs_path, (char* const*)f2fs_argv);

            free(num_sectors);

            std::string num_sectors = std::to_string(length / 512);

            if (length > 512) {

                f2fs_argv[8] = num_sectors.c_str();

            }

            result = exec_cmd(f2fs_argv[0], const_cast<char**>(f2fs_argv));

        }

        if (result != 0) {

            PLOG(ERROR) << "format_volume: make " << v->fs_type << " failed on " << v->blk_device;