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

Commit add9e9b8 authored by Bruno Martins's avatar Bruno Martins
Browse files

fixup! recovery: Add wipe system partition option 

Change-Id: I8808bc49f1dcb5e3f6edb2a33a9eec65aa241068
parent 4712436a

install/include/install/wipe_data.h

+2 −1
Original line number Diff line number Diff line
@@ -31,4 +31,5 @@ bool WipeCache(RecoveryUI* ui, const std::function<bool()>& confirm, 
bool WipeData(Device* device, bool keep_memtag_mode = false, std::string_view new_fstype = "");



// Returns true on success.

bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm);
 
bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm,

                std::string_view new_fstype = "");

install/wipe_data.cpp

+3 −2
Original line number Diff line number Diff line
@@ -169,13 +169,14 @@ bool WipeData(Device* device, bool keep_memtag_mode, std::string_view data_fstyp 
  return success;

}



bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm_func) {

bool WipeSystem(RecoveryUI* ui, const std::function<bool()>& confirm_func,

                std::string_view new_fstype) {

  if (confirm_func && !confirm_func()) {

    return false;

  }



  ui->Print("\n-- Wiping system...\n");

  bool success = EraseVolume(android::fs_mgr::GetSystemRoot().c_str(), ui);

  bool success = EraseVolume(android::fs_mgr::GetSystemRoot().c_str(), ui, new_fstype);

  ui->Print("System wipe %s.\n", success ? "complete" : "failed");

  return success;

}