X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=install%2Fscripts%2F1-install;h=1a50ebf296a1e35696c39c098cb5f30862376166;hb=d9cf94c51253afa7fd8dbefe1fe7635c07e55cc6;hp=f33c33c2a6d9834f85049e31420ee87d77a0e7fe;hpb=23ea90242505f6306f5900d18745c086739a178c;p=android-x86%2Fbootable-newinstaller.git

diff --git a/install/scripts/1-install b/install/scripts/1-install
index f33c33c..1a50ebf 100644
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -1,6 +1,5 @@
 #
 # By Chih-Wei Huang <cwhuang@linux.org.tw>
-# Last updated 2018/02/07
 #
 # License: GNU Public License
 # We explicitely grant the right to use the scripts
@@ -11,6 +10,7 @@ tempfile=/tmp/temp-$$
 menufile=/tmp/menu-$$
 
 CPIO=cpio
+OS_TITLE=${OS_TITLE:-Android-x86}
 
 rebooting()
 {
@@ -61,7 +61,7 @@ find_partition()
 
 list_disks()
 {
-	for b in /sys/block/[shv]d[a-z] /sys/block/mmcblk? /sys/block/nvme*; do
+	for b in /sys/block/[shv]d[a-z] /sys/block/xvd[a-z] /sys/block/mmcblk? /sys/block/nvme*; do
 		[ -d $b ] && echo $b
 	done
 }
@@ -69,7 +69,7 @@ list_disks()
 auto_partition()
 {
 	[ "$AUTO_INSTALL" = "force" ] || dialog --title " Auto Installer " --defaultno --yesno \
-		"\nYou have chosen the AUTO installation.\n\nThe installer will erase the whole /dev/$1 and install Android-x86 to it.\n\nThis is the last confirmation. Are you sure to do so?" 12 61
+		"\nYou have chosen the AUTO installation.\n\nThe installer will erase the whole /dev/$1 and install $OS_TITLE to it.\n\nThis is the last confirmation. Are you sure to do so?" 12 61
 	[ $? -ne 0 ] && rebooting
 
 	if [ -z "$efi" ]; then
@@ -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()
@@ -131,12 +132,15 @@ partition_drive()
 			auto_partition $choice
 			return 1
 		fi
-		dialog --title " Confirm " --defaultno --yesno "\n Do you want to use GPT?" 7 29
-		if [ $? -eq 0 ]; then
-			cgdisk /dev/$choice
+		if fdisk -l /dev/$choice | grep -q GPT; then
+			part_tool=cgdisk
+		elif fdisk -l /dev/$choice | grep -q doesn.t; then
+			dialog --title " Confirm " --defaultno --yesno "\n Do you want to use GPT?" 7 29
+			[ $? -eq 0 ] && part_tool=cgdisk || part_tool=cfdisk
 		else
-			cfdisk /dev/$choice
+			part_tool=cfdisk
 		fi
+		$part_tool /dev/$choice
 		if [ $? -eq 0 ]; then
 			retval=1
 		else
@@ -167,7 +171,7 @@ select_dev()
 		for i in /sys/block/$d/$d*; do
 			[ -d $i ] || continue
 			echo $i | grep -qE "loop|ram|sr|boot|rpmb" && continue
-			f=$(grep "`basename $i`" $tempfile || printf "%-11s%-29s" `basename $i` unknown)
+			f=$(grep "`basename $i`" $tempfile || printf "%-11s%-30s" `basename $i` unknown)
 			sz=$(size_gb $i)
 			[ "$sz" = "0.00GB" ] || printf "$f%10s\n" $sz
 		done
@@ -180,7 +184,7 @@ select_dev()
 	} END {
 		printf("\"\" \"\"\n\"Create/Modify partitions\" \"\"\n\"Detect devices\" \"\"")
 	}' > $menufile
-	choose "Choose Partition" "Please select a partition to install Android-x86:\n\nRecommended minimum free space - 4GB  |  Optimum free space >= 8GB\n\nPartition | Filesystem | Label            | Size     | Drive name/model"
+	choose "Choose Partition" "Please select a partition to install $OS_TITLE:\n\nRecommended minimum free space - 4GB  |  Optimum free space >= 8GB\n\nPartition | Filesystem | Label            | Size     | Drive name/model"
 	return $retval
 }
 
@@ -204,7 +208,7 @@ convert_fs()
 format_fs()
 {
 	local cmd
-	echo -e '"Do not format" ""\next4 ""\nntfs ""\nfat32 ""' > $menufile
+	echo -e '"Do not re-format" ""\next4 ""\nntfs ""\nfat32 ""' > $menufile
 	set_answer_if_auto $FORCE_FORMAT
 	choose "Choose filesystem" "Please select a filesystem to format $1:"
 	case "$choice" in
@@ -249,10 +253,10 @@ create_menulst()
 	[ -n "$VESA" ] && vga=" vga=788 modeset=0"
 	echo -e "${GRUB_OPTIONS:-default=0\ntimeout=6\nsplashimage=/grub/android-x86.xpm.gz\n}root (hd0,$1)\n" > $menulst
 
-	create_entry "Android-x86 $VER" quiet $cmdline
-	create_entry "Android-x86 $VER (Debug mode)" $cmdline DEBUG=2
-	create_entry "Android-x86 $VER (Debug nomodeset)" nomodeset $cmdline DEBUG=2
-	create_entry "Android-x86 $VER (Debug video=LVDS-1:d)" video=LVDS-1:d $cmdline DEBUG=2
+	create_entry "$OS_TITLE $VER" quiet $cmdline
+	create_entry "$OS_TITLE $VER (Debug mode)" $cmdline DEBUG=2
+	create_entry "$OS_TITLE $VER (Debug nomodeset)" nomodeset $cmdline DEBUG=2
+	create_entry "$OS_TITLE $VER (Debug video=LVDS-1:d)" video=LVDS-1:d $cmdline DEBUG=2
 }
 
 create_winitem()
@@ -318,26 +322,34 @@ create_data_img()
 try_upgrade()
 {
 	[ -d $1 ] && return
-	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
-			prev=hd/$v
-		elif [ -d hd/android-$v ]; then
-			prev=hd/android-$v
-		else
-			continue
-		fi
+
+	for d in hd/*; do
+		[ -e "$d"/ramdisk.img -a -n "`ls "$d"/system* 2> /dev/null`" ] && echo \"`basename $d`\" \"\"
+	done | sort -r > $menufile
+
+	count=`wc -l < $menufile`
+	if [ $count -gt 1 ]; then
+		echo -e '"" ""\n"Install to new folder '`basename $1`'" ""' >> $menufile
+		choose "Multiple older versions are found" "Please select one to upgrade:"
+	elif [ $count -eq 1 ]; then
+		eval choice=`awk '{ print $1 }' $menufile`
 		set_answer_if_auto 1
 		adialog --title " Question " --yesno \
-			"\nAn older version $v is detected.\nWould you like to upgrade it?" 8 51
-		if [ $? -eq 0 ]; then
+			"\nAn older version $choice is detected.\nWould you like to upgrade it?" 8 61
+		[ $? -eq 0 ] || choice=
+	fi
+
+	if [ -n "$choice" ]; then
+		prev=hd/$choice
+		if [ -d "$prev" ]; then
 			mv $prev $1
+			for d in `find hd -type l -maxdepth 1`; do
+				[ "`readlink $d`" = "$choice" ] && ln -sf `basename $1` $d
+			done
 			rm -rf $1/data/dalvik-cache/* $1/data/system/wpa_supplicant
-			sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
-			break
+			[ -s $1/data/misc/wifi/wpa_supplicant.conf ] && sed -i 's/\(ctrl_interface=\)\(.*\)/\1wlan0/' $1/data/misc/wifi/wpa_supplicant.conf
 		fi
-	done
+	fi
 }
 
 get_part_info()
@@ -345,7 +357,7 @@ get_part_info()
 	d=0
 	while [ 1 ]; do
 		h=`echo $d | awk '{ printf("%c", $1+97) }'`
-		for part in /sys/block/[shv]d$h/$1 /sys/block/mmcblk$d/$1 /sys/block/nvme0n$(($d+1))/$1; do
+		for part in /sys/block/[shv]d$h/$1 /sys/block/xvd$h/$1 /sys/block/mmcblk$d/$1 /sys/block/nvme0n$(($d+1))/$1; do
 			[ -d $part ] && break 2
 		done
 		d=$(($d+1))
@@ -354,7 +366,7 @@ get_part_info()
 	disk=$(basename `dirname $part`)
 }
 
-install_to()
+wait_for_device()
 {
 	local t=`echo /sys/block/*/$1/partition`
 	[ -f "$t" ] || return 1
@@ -362,6 +374,11 @@ install_to()
 		echo add > `dirname $t`/uevent
 		sleep 1
 	done
+}
+
+install_to()
+{
+	wait_for_device $1 || return 1
 	cd /
 	mountpoint -q /hd && umount /hd
 	[ -n "$AUTO_UPDATE" ] && FORCE_FORMAT=no || FORCE_FORMAT=ext4
@@ -382,8 +399,19 @@ install_to()
 	[ -z "$efi" ] && adialog --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
 		get_part_info $1
+		if fdisk -l /dev/$disk | grep -q GPT; then
+			umount /hd
+			dialog --title " Warning " --defaultno --yesno \
+				"\nFound GPT on /dev/$disk. The legacy GRUB can't be installed to GPT. Do you want to convert it to MBR?\n\nWARNING: This is a dangerous operation. You should backup your data first." 11 63
+			[ $? -eq 1 ] && rebooting
+			plist=$(sgdisk --print /dev/$disk | awk '/^  / { printf "%s:", $1 }' | sed 's/:$//')
+			sgdisk --gpttombr=$plist /dev/$disk > /dev/tty6
+			until try_mount rw /dev/$1 /hd; do
+				sleep 1
+			done
+		fi
+		cp -af /grub /hd
 		p=$(($p-1))
 		create_menulst $p
 		create_winitem $1 $d
@@ -396,22 +424,21 @@ install_to()
 	[ -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 -v $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
+		wait_for_device $boot
+		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
@@ -430,7 +457,7 @@ install_to()
 		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
+		sed -i "s|VER|$VER|; s|CMDLINE|$cmdline|; s|OS_TITLE|$OS_TITLE|" 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
@@ -460,7 +487,10 @@ install_to()
 		fi
 	fi
 
-	set_answer_if_auto 0
+	try_upgrade hd/$asrc
+
+	! test -f hd/$asrc/system.img -o -d hd/$asrc/system
+	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=$?
@@ -480,12 +510,12 @@ install_to()
 	for s in `du -sk $files | awk '{print $1}'`; do
 		size=$(($size+$s))
 	done
-	try_upgrade hd/$asrc
+
 	mkdir -p hd/$asrc
 	cd hd/$asrc
 	rm -rf system*
 	( ( cd /; find $files | $CPIO -H newc -o ) | pv -ns ${size}k | ( $CPIO -iud > /dev/null; echo $? > /tmp/result )) 2>&1 \
-		| progress_bar "Installing Android-x86 to $1" "Expect to write $size KB..."
+		| progress_bar "Installing $OS_TITLE to $1" "Expect to write $size KB..."
 	result=$((`cat /tmp/result`*255))
 
 	if [ $result -eq 0 ]; then
@@ -509,6 +539,7 @@ install_to()
 
 	dialog --infobox "\n Syncing to disk..." 5 27
 	sync
+	cd /
 
 	return $result
 }
@@ -517,9 +548,11 @@ install_hd()
 {
 	case "$AUTO_INSTALL" in
 		[Uu]*)
-			answer=`basename $(blkid | grep -v loop | 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
+			answer=${AUTO_UPDATE:-$(blkid | grep -v loop | grep -v iso9660 | sort | grep Android-x86 | cut -d: -f1 | head -1)}
+			answer=${answer:-$(blkid | grep -v loop | sort | grep ext4 | cut -d: -f1 | head -1)}
+			[ -b "$answer" -o -b /dev/$answer ] && answer=`basename $answer` || answer=
+			AUTO_UPDATE=${answer:-$AUTO_UPDATE}
+			[ -z "$AUTO_UPDATE" ] && AUTO_INSTALL=
 			;;
 		*)
 			[ -z "$answer" ] && set_answer_if_auto Create
@@ -553,14 +586,14 @@ do_install()
 	until install_hd; do
 		if [ $retval -eq 255 ]; then
 			dialog --title ' Error! ' --yes-label Retry --no-label Reboot \
-				--yesno '\nInstallation failed! Please check if you have enough free disk space to install Android-x86.' 8 51
+				--yesno "\nInstallation failed! Please check if you have enough free disk space to install $OS_TITLE." 8 51
 			[ $? -eq 1 ] && rebooting
 		fi
 	done
 
-	[ -n "$VESA" ] || runit="Run Android-x86"
+	[ -n "$VESA" ] || runit="Run $OS_TITLE"
 	dialog --clear --title ' Congratulations! ' \
-		--menu "\n Android-x86 is installed successfully.\n " 11 51 13 \
+		--menu "\n $OS_TITLE is installed successfully.\n " 11 51 13 \
 		"$runit" "" "Reboot" "" 2> $tempfile
 	case "`cat $tempfile`" in
 		Run*)