Let users specify the target disk to auto install

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

diff --git a/install/scripts/1-install b/install/scripts/1-install
index af94fb2..20261d9 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -1,6 +1,6 @@
 #
 # By Chih-Wei Huang <cwhuang@linux.org.tw>
-# Last updated 2018/01/31
+# Last updated 2018/02/08
 #
 # License: GNU Public License
 # We explicitely grant the right to use the scripts
@@ -85,6 +85,7 @@ auto_partition()
                answer=`find_partition $1 $p`
                [ -n "$answer" ] && break
        done
+       [ -n "$efi" ] && mkdosfs -n EFI /dev/`find_partition $1 1`
 }
 
 partition_drive()
@@ -318,7 +319,7 @@ create_data_img()
 try_upgrade()
 {
        [ -d $1 ] && return
-       PREV_VERS="$PREV_VERS 7.1-rc2 7.1-rc1 6.0-r3 6.0-r2 6.0-r1 6.0-rc2 6.0-rc1 5.1-rc1 4.4-r5 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"
+       PREV_VERS="$PREV_VERS 7.1-r1 7.1-rc2 7.1-rc1 6.0-r3 6.0-r2 6.0-r1 6.0-rc2 6.0-rc1 5.1-rc1 4.4-r5 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
                local prev
                if [ -d hd/$v ]; then
@@ -393,25 +394,23 @@ install_to()
                [ $? -ne 0 ] && return 255
        fi
 
-       [ -n "$efi" ] && adialog --title " Confirm " --no-label Skip --defaultno --yesno \
+       [ -n "$efi" ] && adialog --title " Confirm " --no-label Skip --yesno \
                "\n Do you want to install EFI GRUB2?" 7 39
        if [ $? -eq 0 ]; then
-               for i in `list_disks`; do
+               [ -z "$AUTO_INSTALL" -o -n "$AUTO_UPDATE" ] && for i in `list_disks`; do
                        disk=`basename $i`
                        esp=`sgdisk --print /dev/$disk 2> /dev/null | grep EF00 | awk '{print $1}'`
                        [ -n "$esp" ] && boot=`find_partition $disk $esp` && break
                done
                if [ -z "$esp" ]; then
                        get_part_info $1
-                       boot=`basename $(blkid /dev/$disk* | grep vfat | cut -d: -f1 | head -1)`
-                       [ -z "$boot" ] && boot=`find_partition $disk 1`
+                       boot=$(blkid /dev/$disk* | grep vfat | cut -d: -f1 | head -1)
+                       [ -z "$boot" ] && boot=`find_partition $disk 1` || boot=`basename $boot`
                        esp=`cat /sys/block/$disk/$boot/partition`
                fi
                mkdir -p efi
                mountpoint -q efi && umount efi
-               while [ 1 ]; do
-                       [ -n "$AUTO_INSTALL" -a -z "$AUTO_UPDATE" ] && mkdosfs -n EFI /dev/$boot
-                       try_mount rw /dev/$boot efi && break
+               until try_mount rw /dev/$boot efi; do
                        dialog --title " Confirm " --defaultno --yesno "\n Cannot mount /dev/$boot.\n Do you want to format it?" 8 37
                        [ $? -eq 0 ] && mkdosfs -n EFI /dev/$boot
                done
@@ -422,17 +421,23 @@ install_to()
                        grubcfg=efi/boot/grub/x86_64-efi/grub.cfg
                        bootefi=BOOTx64.EFI
                fi
-               mkdir -p `dirname $grubcfg` efi/efi/Android
-               cp -af grub2/efi/boot/* efi/efi/Android
-               sed -i "s|VER|$VER|; s|CMDLINE|$cmdline|" efi/efi/Android/android.cfg
+               if [ -d efi/efi/boot -a ! -s efi/efi/boot/android.cfg ]; then
+                       efidir=/efi/Android
+               else
+                       efidir=/efi/boot
+                       rm -rf efi/efi/Android
+               fi
+               mkdir -p `dirname $grubcfg` efi$efidir
+               cp -af grub2/efi/boot/* efi$efidir
+               sed -i "s|VER|$VER|; s|CMDLINE|$cmdline|" efi$efidir/android.cfg
                [ -s efi/boot/grub/grubenv ] || ( printf %-1024s "# GRUB Environment Block%" | sed 's/k%/k\n/; s/   /###/g' > efi/boot/grub/grubenv )
 
                echo -e 'set timeout=5\nset debug_mode="(DEBUG mode)"' > $grubcfg
                # Our grub-efi doesn't support ntfs directly.
                # Copy boot files to ESP so grub-efi could read them
                if [ "$fs" = "fuseblk" ]; then
-                       cp -f src/kernel src/initrd.img efi/efi/Android
-                       echo -e "set kdir=/efi/Android\nset src=SRC=/$asrc" >> $grubcfg
+                       cp -f src/kernel src/initrd.img efi$efidir
+                       echo -e "set kdir=$efidir\nset src=SRC=/$asrc" >> $grubcfg
                else
                        echo -e "set kdir=/$asrc" >> $grubcfg
                fi
@@ -442,12 +447,16 @@ install_to()
                efibootmgr | grep -Eo ".{0,6}Android-x86" | cut -c1-4 > /tmp/efientries
                if [ -s /tmp/efientries ]; then
                        set_answer_if_auto 1
-                       adialog --title " Question " --defaultno --yesno "\nEFI boot entries for previous Android-x86 installations were found.\n\nDo you wish to delete them?" 10 61
+                       adialog --title " Question " --yesno "\nEFI boot entries for previous Android-x86 installations were found.\n\nDo you wish to delete them?" 10 61
                        [ $? -eq 0 ] && while read entry; do efibootmgr -Bb "$entry" > /dev/tty4 2>&1; done < /tmp/efientries
                fi
-               efibootmgr -v -c -d /dev/$disk -p $esp -L "Android-x86 $VER" -l /efi/Android/$bootefi > /dev/tty4 2>&1
+               efibootmgr -v -c -d /dev/$disk -p $esp -L "Android-x86 $VER" -l $efidir/$bootefi > /dev/tty4 2>&1
 
-               [ -s efi/startup.nsh ] || echo \\efi\\Android\\$bootefi > efi/startup.nsh
+               if [ -s efi/startup.nsh ]; then
+                       sed -i "s|\\\\efi\\\\Android|$efidir|; s|/|\\\\|g" efi/startup.nsh
+               else
+                       echo $efidir/$bootefi | sed 's|/|\\|g' > efi/startup.nsh
+               fi
        fi
 
        set_answer_if_auto 0
@@ -507,7 +516,7 @@ install_hd()
 {
        case "$AUTO_INSTALL" in
                [Uu]*)
-                       answer=`basename $(blkid | grep -v loop | sort | grep Android-x86 | cut -d: -f1 | head -1)`
+                       answer=`basename $(blkid | grep -v loop | grep -v iso9660 | sort | grep Android-x86 | cut -d: -f1 | head -1)`
                        [ -z "$answer" ] && answer=`basename $(blkid | grep -v loop | sort | grep ext4 | cut -d: -f1 | head -1)`
                        AUTO_UPDATE=$answer
                        ;;