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

Unverified Commit f60613b4 authored by cfig's avatar cfig
Browse files

fastboot: preserve partition_type if wants_wipe=true 

originally if wants_wipe=true, program will erase and format partitions,
but after fb->Erase(), partition type should be raw(all 0xFFs),
then following fb_perform_format() will miss its original partition_type
Now we call fb_perform_format() with original fs type to keep the
partition consistent after wiping.

Change-Id: Ic778850588d5dd6fee23169d20c26bcbaa510627
parent 50ca4484

fastboot/fastboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2058,10 +2058,10 @@ int FastBootTool::Main(int argc, char* argv[]) { 
            if (partition == "userdata" && set_fbe_marker) {

                fprintf(stderr, "setting FBE marker on initial userdata...\n");

                std::string initial_userdata_dir = create_fbemarker_tmpdir();

                fb_perform_format(partition, 1, "", "", initial_userdata_dir);

                fb_perform_format(partition, 1, partition_type, "", initial_userdata_dir);

                delete_fbemarker_tmpdir(initial_userdata_dir);

            } else {

                fb_perform_format(partition, 1, "", "", "");

                fb_perform_format(partition, 1, partition_type, "", "");

            }

        }

    }