losetup -d /dev/loop7
}
+gen_img()
+{
+ if [ "$fs" = "vfat" ]; then
+ ( dd bs=1M count=$1 if=/dev/zero | pv -ns $1m | dd of=$2 ) 2>&1 \
+ | progress_bar "Creating `basename $2`" "Expect to write $1 MB..."
+ else
+ dd if=/dev/zero bs=1 count=0 seek=$1M of=$2
+ fi
+}
+
create_img()
{
bname=`basename $2`
dialog --title " Question " --nook --nocancel --inputbox \
"\nPlease input the size of the $bname in MB:" 8 63 $1 2> $tempfile
size=`cat $tempfile`
- [ 0$size -le 0 ] && size=1024
- ( dd bs=1M count=$size if=/dev/zero | pv -ns ${size}m | dd of=$2 ) 2>&1 \
- | progress_bar "Creating $bname" "Expect to write $size MB..."
+ [ 0$size -le 0 ] && size=2048
+ gen_img $size $2
}
create_data_img()
{
dialog --title " Confirm " --yesno \
- "\nThe installer is going to create a disk image to save the user data. At least 512MB free disk space is recommended.\n\nAre you sure to create the image?" 11 62
+ "\nThe installer is going to create a disk image to save the user data. At least 2048MB free disk space is recommended.\n\nAre you sure to create the image?" 11 62
if [ $? -eq 0 ]; then
- if create_img 512 data.img; then
+ if create_img 2048 data.img; then
losetup /dev/loop6 data.img
make_ext4fs -L /data /dev/loop6 > /dev/tty6
fi
echo -e "set kdir=/$asrc" >> $grubcfg
fi
echo -e '\nsource $cmdpath/android.cfg' >> $grubcfg
+ if [ -d src/boot/grub/theme ]; then
+ cp -R src/boot/grub/[ft]* efi/boot/grub
+ find efi/boot/grub -name TRANS.TBL -delete
+ fi
# Checking for old EFI entries, removing them and adding new depending on bitness
efibootmgr | grep -Eo ".{0,6}Android-x86" | cut -c1-4 > /tmp/efientries
set_answer_if_auto $?
adialog --title " Question " --defaultno --yesno \
"\nDo you want to install /system directory as read-write?\n\nMaking /system be read-write is easier for debugging, but it needs more disk space and longer installation time." 10 61
- instal_rw=$?
-
- files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK"
- if [ $instal_rw -eq 0 ]; then
- if [ "$fs" = "vfat" -o "$fs" = "fuseblk" ]; then
- [ -e /sfs/system.img ] && sysimg="/sfs/system.img" || sysimg="mnt/$SRC/system.*"
- else
- sysimg="android/system"
- fi
+ if [ $? -eq 0 -a -e /sfs/system.img ]; then
+ sysimg="/sfs/system.img"
else
sysimg="mnt/$SRC/system.*"
fi
- files="$files $sysimg"
+ files="mnt/$SRC/kernel mnt/$SRC/initrd.img mnt/$SRC/$RAMDISK $sysimg"
size=0
for s in `du -sk $files | awk '{print $1}'`; do
size=$(($size+$s))