commit 2f73e58ef8cf5f8d0f735ce7c42326c09041417f
author Koushik Dutta <koushd@gmail.com> Sun Apr 18 16:00:21 2010 -0700
committer Koushik Dutta <koushd@gmail.com> Sun Apr 18 16:00:21 2010 -0700
tree bc129f3f9c3a9b02aee321cd1fd7277b9c515ccd
parent 7fe4d7bbcbe1950839c963d4ba07f71a6db362b6

Unmount partitions after restore (except for CACHE:).
Wipe sd-ext on data wipe.
Fix bug where wiping SDEXT: did not work.

nandroid.c

diff --git a/nandroid.c b/nandroid.c
index 8485f47..c4c92d8 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -75,7 +75,7 @@
     ui_show_progress(1, 0);
 }
 
-int nandroid_backup_partition(char* backup_path, char* root) {
+int nandroid_backup_partition(const char* backup_path, char* root) {
     int ret = 0;
     char mount_point[PATH_MAX];
     translate_root_path(root, mount_point, PATH_MAX);
@@ -98,7 +98,7 @@
     return 0;
 }
 
-int nandroid_backup(char* backup_path)
+int nandroid_backup(const char* backup_path)
 {
     ui_set_background(BACKGROUND_ICON_INSTALLING);
     
@@ -171,7 +171,7 @@
 
 typedef int (*format_function)(char* root);
 
-int nandroid_restore_partition_internal(char* backup_path, char* root, format_function formatter) {
+int nandroid_restore_partition(const char* backup_path, const char* root) {
     int ret = 0;
     char mount_point[PATH_MAX];
     translate_root_path(root, mount_point, PATH_MAX);
@@ -182,7 +182,7 @@
         ui_print("Can't unmount %s!\n", mount_point);
         return ret;
     }
-    if (0 != (ret = formatter(root))) {
+    if (0 != (ret = format_root_device(root))) {
         ui_print("Error while formatting %s!\n", root);
         return ret;
     }
@@ -198,14 +198,14 @@
         ui_print("Error while restoring %s!\n", mount_point);
         return ret;
     }
+
+    if (0 != strcmp(root, "CACHE")) {
+        ensure_root_path_unmounted(root);
+    }
     return 0;
 }
 
-int nandroid_restore_partition(char* backup_path, char* root) {
-    return nandroid_restore_partition_internal(backup_path, root, format_root_device);
-}
-
-int nandroid_restore(char* backup_path, int restore_boot, int restore_system, int restore_data, int restore_cache, int restore_sdext)
+int nandroid_restore(const char* backup_path, int restore_boot, int restore_system, int restore_data, int restore_cache, int restore_sdext)
 {
     ui_set_background(BACKGROUND_ICON_INSTALLING);
     ui_show_indeterminate_progress();
@@ -247,7 +247,7 @@
         sprintf(tmp, "%s/sd-ext.img", backup_path);
         if (0 != (ret = statfs(tmp, &s)))
             ui_print("sd-ext.img not found. Skipping restore of /sd-ext.");
-        else if (0 != (ret = nandroid_restore_partition_internal(backup_path, "SDEXT:", format_mmc_device)))
+        else if (0 != (ret = nandroid_restore_partition(backup_path, "SDEXT:")))
             return ret;
     }