Search for efi partition

[android-x86/bootable-newinstaller.git] / install / scripts / 1-install

diff --git a/install/scripts/1-install b/install/scripts/1-install
index 1300d4b..094a032 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -218,7 +218,7 @@ create_data_img()
 try_upgrade()
 {
        [ -d $1 ] && return
-       PREV_VERS="4.4-r3 4.4-r2 4.4-r1 4.4-RC2 4.4-RC1 4.4-test 4.3-test 4.2-test 4.0-r1 4.0-RC2 4.0-RC1"
+       PREV_VERS="4.4-r4 4.4-r3 4.4-r2 4.4-r1 4.4-RC2 4.4-RC1 4.4-test 4.3-test 4.2-test 4.0-r1 4.0-RC2 4.0-RC1"
        for v in $PREV_VERS; do
                prev=hd/android-$v
                if [ -d $prev ]; then
@@ -283,9 +283,10 @@ install_to()
        if [ $? -eq 0 ]; then
                get_part_info $1
                for i in /sys/block/$disk/$disk*; do
-                       [ 0`cat $i/partition` -eq 1 ] && break
+                       [ 0`cat $i/partition` -eq 1 ] && b=$i
+                       [ $(blkid /dev/`basename $i` | grep -c vfat) -ne 0 ] && b=$i && break
                done
-               boot=`basename $i`
+               boot=`basename $b`
                mountpoint -q /hd && umount /hd
                dialog --title " Confirm " --defaultno --yesno \
                        "\n Do you want to format the boot partition\n /dev/$boot?" 8 45