diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 02:55:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-06 02:55:56 +0000 |
| commit | 271e85df04304d0fe229d2bfb36a6b86ddb5db72 (patch) | |
| tree | 04fd8865bdb4d5724b63f3765b335f03c1e11326 | |
| parent | 5952a033b391356a02931a82a8bc7efef6eabed7 (diff) | |
| parent | a2ab8e596ce7f61bb1b00b6c5023a24e1b42222d (diff) | |
| download | gsid-271e85df04304d0fe229d2bfb36a6b86ddb5db72.tar.gz | |
Fix gsi_tool wipe-data am: 423129bb53 am: a2ab8e596c
Change-Id: I49b852212209001bc795c306f3ef7d82c692b7a6
| -rw-r--r-- | gsi_tool.cpp | 2 | ||||
| -rw-r--r-- | 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<IGsiService> 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; } } |