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

Commit 98a658bb authored by Connor O'Brien's avatar Connor O'Brien
Browse files

Use flash erase & logical block size for userdata wipe 



If flash erase and logical block size are available, then pass them
to libext4_utils when rebuilding userdata.

Test: Factory reset marlin in recovery, confirmed params passed correctly
Bug: 33243520
Change-Id: I6bed976a73e7a64a80eaac50f48fbacb6d812517
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
parent a4763127

roots.cpp

+6 −1
Original line number Diff line number Diff line
@@ -215,7 +215,12 @@ int format_volume(const char* volume, const char* directory) { 
        }

        int result;

        if (strcmp(v->fs_type, "ext4") == 0) {

            if (v->erase_blk_size != 0 && v->logical_blk_size != 0) {

                result = make_ext4fs_directory_align(v->blk_device, length, volume, sehandle,

                        directory, v->erase_blk_size, v->logical_blk_size);

            } else {

                result = make_ext4fs_directory(v->blk_device, length, volume, sehandle, directory);

            }

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

            if (v->key_loc != NULL && strcmp(v->key_loc, "footer") == 0 && length < 0) {

                LOG(ERROR) << "format_volume: crypt footer + negative length (" << length