From d7d4208976125d114d0b8e44438e2417d5275098 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Fri, 17 Sep 2010 13:02:48 -0700 Subject: remove unneeded partition roots Recovery itself no longer needs to access all these partitions; manipulation of them is done by the updater binary. This is a small first step towards removing roots entirely. Change-Id: I3fbcada32079a37db4cc097861dfa91e0a08da30 --- install.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'install.c') diff --git a/install.c b/install.c index 2619a0cc0..a56dbd048 100644 --- a/install.c +++ b/install.c @@ -159,17 +159,6 @@ try_update_binary(const char *path, ZipArchive *zip) { return INSTALL_SUCCESS; } -static int -handle_update_package(const char *path, ZipArchive *zip) -{ - // Update should take the rest of the progress bar. - ui_print("Installing update...\n"); - - int result = try_update_binary(path, zip); - register_package_root(NULL, NULL); // Unregister package root - return result; -} - // Reads a file containing one or more public keys as produced by // DumpPublicKey: this is an RSAPublicKey struct as it would appear // as a C source literal, eg: @@ -300,6 +289,6 @@ install_package(const char *root_path) /* Verify and install the contents of the package. */ - int status = handle_update_package(path, &zip); - return status; + ui_print("Installing update...\n"); + return try_update_binary(path, &zip); } -- cgit v1.2.3