commit 5460f0c746140ddb19fdfa4eda55c2f5124075bf
author Koushik Dutta <koushd@gmail.com> Sat Dec 18 22:37:49 2010 -0800
committer Koushik Dutta <koushd@gmail.com> Sat Dec 18 22:37:49 2010 -0800
tree 6d8e924d64988e17f6b8ce61a629ad0cd140e0be
parent 5d80817f2b6e9648e579700bbc73826601dfc539

Automatically detect /datadata from recovery.fstab. Remove BOARD_HAS_DATADATA.

Change-Id: I28d3c7a6beaacd77c67c5af0ae3464acfd2572e3

nandroid.c

diff --git a/nandroid.c b/nandroid.c
index 5d7b9d4..5d174a7 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -147,10 +147,10 @@
     if (0 != (ret = nandroid_backup_partition(backup_path, "/data")))
         return ret;
 
-#ifdef BOARD_HAS_DATADATA
-    if (0 != (ret = nandroid_backup_partition(backup_path, "/datadata")))
-        return ret;
-#endif
+    if (has_datadata()) {
+        if (0 != (ret = nandroid_backup_partition(backup_path, "/datadata")))
+            return ret;
+    }
 
     struct stat st;
     if (0 != stat("/sdcard/.android_secure", &st))
@@ -291,10 +291,10 @@
     if (restore_data && 0 != (ret = nandroid_restore_partition(backup_path, "/data")))
         return ret;
         
-#ifdef BOARD_HAS_DATADATA
-    if (restore_data && 0 != (ret = nandroid_restore_partition(backup_path, "/datadata")))
-        return ret;
-#endif
+    if (has_datadata()) {
+        if (restore_data && 0 != (ret = nandroid_restore_partition(backup_path, "/datadata")))
+            return ret;
+    }
 
     if (restore_data && 0 != (ret = nandroid_restore_partition_extended(backup_path, "/sdcard/.android_secure", 0)))
         return ret;