commit 1f27821568065715d3235c0e690c42d0d7a413bc
author San Mehat <san@google.com> Thu Jul 16 10:44:15 2009 -0700
committer San Mehat <san@google.com> Thu Jul 16 11:41:33 2009 -0700
tree e7137504d6072dcc2375d166c8d7bd464947c905
parent d8221d9869f9fe1031219e8f6cbcef0771d767fa

vold: If we're bootstrapping, don't automatically mount the SD card. Also fixes some
error display bugs (our printf doesnt support %m)

Signed-off-by: San Mehat <san@google.com>

vold/volmgr.c

diff --git a/vold/volmgr.c b/vold/volmgr.c
index b7c5ddc..3c34a9c 100644
--- a/vold/volmgr.c
+++ b/vold/volmgr.c
@@ -583,7 +583,7 @@
             LOG_VOL("_volmgr_start(%s, %d:%d) rc = %d",
                     vol->mount_point, part->major, part->minor, rc);
 #endif
-            if (!rc) 
+            if (!rc || rc == -EBUSY) 
                 break;
         }
 
@@ -1065,6 +1065,13 @@
 
     vol->dev = dev; 
 
+    if (bootstrap) {
+        LOGI("Aborting start of %s (bootstrap = %d)\n", vol->mount_point,
+             bootstrap);
+        vol->state = volstate_unmounted;
+        return -EBUSY;
+    }
+
     vol->worker_args.start_args.fs = fs;
     vol->worker_args.start_args.dev = dev;