Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86

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

diff --git a/install/scripts/1-install b/install/scripts/1-install
index fd68e1c..e2b2e74 100644 (file)
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -117,9 +117,13 @@ progress_bar()
 format_fs()
 {
        local cmd
-       echo -e '"Do not format" ""\next3 ""\next2 ""\nntfs ""\nfat32 ""' > $menufile
+       echo -e '"Do not format" ""\next4 ""\next3 ""\next2 ""\nntfs ""\nfat32 ""' > $menufile
        choose "Choose filesystem" "Please select a filesystem to format $1:"
        case "$choice" in
+               ext4)
+                       dialog --title " Notice " --msgbox "\nAndroid-x86 bootloader can't support booting from ext4. You need to install a bootloader supporting ext4 manually, e.g., grub2." 9 49
+                       cmd="make_ext4fs -L"
+                       ;;
                ext3)
                        cmd="mke2fs -jL"
                        ;;
@@ -206,7 +210,7 @@ create_data_img()
        if [ $? -eq 0 ]; then
                if create_img 512 data.img; then
                        losetup /dev/loop6 data.img
-                       mke2fs -jL /data /dev/loop6 > /dev/tty6
+                       make_ext4fs -L /data /dev/loop6 > /dev/tty6
                fi
                [ $? -ne 0 ] && dialog --msgbox "\n Failed to create data.img." 7 33
        else
@@ -264,7 +268,7 @@ install_to()
        cmdline=`sed "s|\(initrd.*img\s*\)||; s|quiet\s*||; s|\(vga=\w\+\?\s*\)||; s|\(DPI=\w\+\?\s*\)||; s|\(INSTALL=\w\+\?\s*\)||; s|\(SRC=\S\+\?\s*\)||; s|\(DEBUG=\w\+\?\s*\)||; s|\(BOOT_IMAGE=\S\+\?\s*\)||" /proc/cmdline`
 
        asrc=android-$VER
-       dialog --title " Confirm " --no-label Skip --defaultno --yesno \
+       [ "$fs" != "ext4" ] && dialog --title " Confirm " --no-label Skip --defaultno --yesno \
                "\n Do you want to install boot loader GRUB?" 7 47
        if [ $? -eq 0 ]; then
                cp -af /grub /hd