Mount USB with its type

Change-Id: I5f33c5f311cfbbd46535d2a408368c65ba059bbf

diff --git a/scripts/recovery-init.in b/scripts/recovery-init.in
index 613f0b0..c0cb159 100644 (file)
--- a/scripts/recovery-init.in
+++ b/scripts/recovery-init.in
@@ -36,38 +36,35 @@ mount_usb_partitions() {
         vfat
     )
 
-    DEVICES=""
+    LAST_MOUNTED_DEVICE=""
     for DEVICE_TYPE in ${DEVICE_TYPE_LIST[@]}
     do
+        DEVICES=""
         for ((i=0; i<10; i++))
         do
-            DEVICE=$("$BLKID" /dev/sd* -t TYPE="${DEVICE_TYPE}" -o device)
-            if [ ! -z "${DEVICE}" ]
+            DEVICES=$("$BLKID" /dev/sd* -t TYPE="${DEVICE_TYPE}" -o device)
+            if [ ! -z "${DEVICES}" ]
             then
+                for DEVICE in ${DEVICES}
+                do
+                    USB_MOUNTPOINT_INDEX=$(echo ${DEVICE} | "$CUT" -b 8- | "$TR" '[:lower:]' '[:upper:]')
+                    USB_MOUNTPOINT=${USB_MOUNTPOINT_PREFIX}${USB_MOUNTPOINT_INDEX}
+                    "$MKDIR" -p ${USB_MOUNTPOINT}
+                    "$MOUNT" -t ${DEVICE_TYPE} ${DEVICE} ${USB_MOUNTPOINT}
+
+                    LAST_MOUNTED_DEVICE=${DEVICE}
+                done
                 break
             fi
 
             sleep 1
         done
-
-        if [ ! -z "${DEVICE}" ]
-        then
-            DEVICES="${DEVICES} ${DEVICE}"
-        fi
     done
 
-    if [ -z "${DEVICES}" ]
+    if [ -z "${LAST_MOUNTED_DEVICE}" ]
     then
         echo "WARNING : USB not mounted"
     fi
-
-    for DEVICE in ${DEVICES}
-    do
-        USB_MOUNTPOINT_INDEX=$(echo ${DEVICE} | "$CUT" -b 8- | "$TR" '[:lower:]' '[:upper:]')
-        USB_MOUNTPOINT=${USB_MOUNTPOINT_PREFIX}${USB_MOUNTPOINT_INDEX}
-        "$MKDIR" -p ${USB_MOUNTPOINT}
-        "$MOUNT" -t ${DEVICE_TYPE} ${DEVICE} ${USB_MOUNTPOINT}
-    done
 }
 
 #------------------------------------------------