diff options
author | Doug Zongker <dougz@android.com> | 2010-09-14 18:06:55 -0700 |
---|---|---|
committer | Doug Zongker <dougz@android.com> | 2010-09-14 21:26:38 -0700 |
commit | 8e5e4dada713609c9b2c45ea9cf4572bb89ef761 (patch) | |
tree | b1dd9d0f6408811e71dade4f1ccbc52f18114a5e /install.c | |
parent | d12560aa2134d3af21a1220cd4873553f9c51743 (diff) | |
download | bootable_recovery-8e5e4dada713609c9b2c45ea9cf4572bb89ef761.zip bootable_recovery-8e5e4dada713609c9b2c45ea9cf4572bb89ef761.tar.gz bootable_recovery-8e5e4dada713609c9b2c45ea9cf4572bb89ef761.tar.bz2 |
close update package before installing; allow remount
Close the update package before invoking the binary, to allow the
installer to unmount /cache if it wants to. Add a function to allow
remounting of a mount as read-only.
Change-Id: Idfcc96c3da66083295177f729263560be58034e4
Diffstat (limited to 'install.c')
-rw-r--r-- | install.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -42,6 +42,7 @@ try_update_binary(const char *path, ZipArchive *zip) { const ZipEntry* binary_entry = mzFindZipEntry(zip, ASSUMED_UPDATE_BINARY_NAME); if (binary_entry == NULL) { + mzCloseZipArchive(zip); return INSTALL_CORRUPT; } @@ -49,11 +50,13 @@ try_update_binary(const char *path, ZipArchive *zip) { unlink(binary); int fd = creat(binary, 0755); if (fd < 0) { + mzCloseZipArchive(zip); LOGE("Can't make %s\n", binary); return 1; } bool ok = mzExtractZipEntryToFile(zip, binary_entry, fd); close(fd); + mzCloseZipArchive(zip); if (!ok) { LOGE("Can't copy %s\n", ASSUMED_UPDATE_BINARY_NAME); @@ -298,6 +301,5 @@ install_package(const char *root_path) /* Verify and install the contents of the package. */ int status = handle_update_package(path, &zip); - mzCloseZipArchive(&zip); return status; } |