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"
;;
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
try_upgrade()
{
[ -d $1 ] && return
- PREV_VERS="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-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
fs=`cat /proc/mounts | grep /dev/$1 | awk '{ print $3 }'`
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
Run*)
cd /android
umount system
- if mountpoint -q /sfs; then
- umount /sfs
- if [ -e /hd/$asrc/system.sfs ]; then
- mount -o loop /hd/$asrc/system.sfs /sfs
- mount -o loop /sfs/system.img system
- else
- mount -o loop /hd/$asrc/system.img system
- fi
- else
+ mountpoint -q /sfs && umount /sfs
+ if [ -e /hd/$asrc/system.sfs ]; then
+ mount -o loop /hd/$asrc/system.sfs /sfs
+ mount -o loop /sfs/system.img system
+ elif [ -e /hd/$asrc/system.img ]; then
mount -o loop /hd/$asrc/system.img system
+ else
+ mount --bind /hd/$asrc/system system
fi
if [ -d /hd/$asrc/data ]; then
mount --bind /hd/$asrc/data data