diff options
Diffstat (limited to 'partition_installer.cpp')
| -rw-r--r-- | partition_installer.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/partition_installer.cpp b/partition_installer.cpp index 8e67420..ff2cc59 100644 --- a/partition_installer.cpp +++ b/partition_installer.cpp @@ -44,9 +44,15 @@ using android::base::unique_fd; static constexpr uint32_t kMinimumFreeSpaceThreshold = 40; PartitionInstaller::PartitionInstaller(GsiService* service, const std::string& install_dir, - const std::string& name, int64_t size, bool read_only) - : service_(service), install_dir_(install_dir), name_(name), size_(size), readOnly_(read_only) { - images_ = ImageManager::Open(kDsuMetadataDir, install_dir_); + const std::string& name, const std::string& active_dsu, + int64_t size, bool read_only) + : service_(service), + install_dir_(install_dir), + name_(name), + active_dsu_(active_dsu), + size_(size), + readOnly_(read_only) { + images_ = ImageManager::Open(MetadataDir(active_dsu), install_dir_); } PartitionInstaller::~PartitionInstaller() { @@ -62,7 +68,7 @@ PartitionInstaller::~PartitionInstaller() { } void PartitionInstaller::PostInstallCleanup() { - auto manager = ImageManager::Open(kDsuMetadataDir, GsiService::GetInstalledImageDir()); + auto manager = ImageManager::Open(MetadataDir(active_dsu_), install_dir_); if (!manager) { LOG(ERROR) << "Could not open image manager"; return; @@ -299,13 +305,13 @@ bool PartitionInstaller::Format() { } int PartitionInstaller::Finish() { - if (!readOnly_ && gsi_bytes_written_ != size_) { + if (readOnly_ && gsi_bytes_written_ != size_) { // We cannot boot if the image is incomplete. LOG(ERROR) << "image incomplete; expected " << size_ << " bytes, waiting for " << (size_ - gsi_bytes_written_) << " bytes"; return IGsiService::INSTALL_ERROR_GENERIC; } - if (fsync(system_device_->fd())) { + if (system_device_ != nullptr && fsync(system_device_->fd())) { PLOG(ERROR) << "fsync failed for " << name_ << "_gsi"; return IGsiService::INSTALL_ERROR_GENERIC; } @@ -321,8 +327,9 @@ int PartitionInstaller::Finish() { return IGsiService::INSTALL_OK; } -int PartitionInstaller::WipeWritable(const std::string& install_dir, const std::string& name) { - auto image = ImageManager::Open(kDsuMetadataDir, install_dir); +int PartitionInstaller::WipeWritable(const std::string& active_dsu, const std::string& install_dir, + const std::string& name) { + auto image = ImageManager::Open(MetadataDir(active_dsu), install_dir); // The device object has to be destroyed before the image object auto device = MappedDevice::Open(image.get(), 10s, name); if (!device) { |