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

Merge commit '1f27821568065715d3235c0e690c42d0d7a413bc'

* commit '1f27821568065715d3235c0e690c42d0d7a413bc':
  vold: If we're bootstrapping, don't automatically mount the SD card. Also fixes some

1 files changed, 8 insertions, 4 deletions

diff --git a/vold/uevent.c b/vold/uevent.c
index 66e70c59..dffe8170 100644
--- a/vold/uevent.c
+++ b/vold/uevent.c
@@ -333,7 +333,7 @@ static int handle_block_event(struct uevent *event)
                                      min,
                                      media,
                                      get_uevent_param(event, "DEVTYPE")))) {
-            LOGE("Unable to allocate new blkdev (%m)");
+            LOGE("Unable to allocate new blkdev (%s)", strerror(errno));
             return -1;
         }
 
@@ -354,8 +354,12 @@ static int handle_block_event(struct uevent *event)
 
         if (blkdev_get_num_pending_partitions(blkdev->disk) == 0) {
             if ((rc = volmgr_consider_disk(blkdev->disk)) < 0) {
-                LOGE("Volmgr failed to handle device (%d)", rc);
-                return rc;
+                if (rc == -EBUSY) {
+                    LOGI("Volmgr not ready to handle device");
+                } else {
+                    LOGE("Volmgr failed to handle device (%d)", rc);
+                    return rc;
+                }
             }
         }
     } else if (event->action == action_remove) {
@@ -414,7 +418,7 @@ static int handle_mmc_event(struct uevent *event)
                                    get_uevent_param(event, "MMC_NAME"),
                                    serial,
                                    media_mmc))) {
-            LOGE("Unable to allocate new media (%m)");
+            LOGE("Unable to allocate new media (%s)", strerror(errno));
             return -1;
         }
         LOGI("New MMC card '%s' (serial %u) added @ %s", media->name,