nandroid/root/extendedcommands: attenuate for /data not being auto in fstab

Change-Id: I0e7bec03bb29f1ae72f23321f89cf704e54ff4d9

1 files changed, 4 insertions, 1 deletions

diff --git a/roots.c b/roots.c
index 4835ce85..49973501 100644
--- a/roots.c
+++ b/roots.c
@@ -197,7 +197,7 @@ int try_mount(const char* device, const char* mount_point, const char* fs_type,
 
 int is_data_media() {
     Volume *data = volume_for_path("/data");
-    return data != NULL && strcmp(data->fs_type, "auto") == 0 && volume_for_path("/sdcard") == NULL;
+    return data != NULL && strcmp(data->fs_type, "auto") == 0 || volume_for_path("/sdcard") == NULL;
 }
 
 void setup_data_media() {
@@ -334,6 +334,9 @@ int format_volume(const char* volume) {
         LOGE("unknown volume \"%s\"\n", volume);
         return -1;
     }
+    if (strstr(volume, "/data") == volume && volume_for_path("/sdcard") == NULL && is_data_media()) {
+	return format_unknown_device(NULL, volume, NULL);
+    }
     if (strcmp(v->fs_type, "ramdisk") == 0) {
         // you can't format the ramdisk.
         LOGE("can't format_volume \"%s\"", volume);