From 423129bb53e9c238342b14ffac2651a1a0142dc0 Mon Sep 17 00:00:00 2001 From: Howard Chen Date: Tue, 3 Mar 2020 13:28:37 +0800 Subject: Fix gsi_tool wipe-data Bug: 149962466 Test: gsi_tool wipe-data Merged-In: I3265805c95ebad4ed37c4f0f0df2840214e232d4 Change-Id: I3265805c95ebad4ed37c4f0f0df2840214e232d4 --- gsi_tool.cpp | 2 +- partition_installer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gsi_tool.cpp b/gsi_tool.cpp index a38bf20..b059947 100644 --- a/gsi_tool.cpp +++ b/gsi_tool.cpp @@ -374,7 +374,7 @@ static int WipeData(sp gsid, int argc, char** /* argv */) { } int error; - status = gsid->zeroPartition("userdata", &error); + status = gsid->zeroPartition("userdata" + std::string(kDsuPostfix), &error); if (!status.isOk() || error) { std::cerr << "Could not wipe GSI userdata: " << ErrorMessage(status, error) << "\n"; return EX_SOFTWARE; diff --git a/partition_installer.cpp b/partition_installer.cpp index 2ac313f..357df50 100644 --- a/partition_installer.cpp +++ b/partition_installer.cpp @@ -348,7 +348,7 @@ int PartitionInstaller::WipeWritable(const std::string& active_dsu, const std::s uint64_t erase_size = std::min(kEraseSize, get_block_device_size(device->fd())); for (uint64_t i = 0; i < erase_size; i += zeroes.size()) { if (!android::base::WriteFully(device->fd(), zeroes.data(), zeroes.size())) { - PLOG(ERROR) << "write userdata_gsi"; + PLOG(ERROR) << "write " << name; return IGsiService::INSTALL_ERROR_GENERIC; } } -- cgit v1.2.3