From 13ad13483a2be3e53a3f7dcaba3e8798fa53ba3d Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Wed, 17 Jan 2018 17:19:06 +0800
Subject: [PATCH] 1-install: mount ESP partition to /efi dir

It's easier for debugging.
---
 install/scripts/1-install | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/install/scripts/1-install b/install/scripts/1-install
index c40f089..a537a5f 100644
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -331,28 +331,29 @@ install_to()
 		done
 		boot=`basename $b`
 		bootp=`cat $b/partition`
-		mountpoint -q /hd && umount /hd
+		mkdir -p efi
+		mountpoint -q efi && umount efi
 		while [ 1 ]; do
-			try_mount rw /dev/$boot /hd && break
+			try_mount rw /dev/$boot efi && break
 			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
 		if [ "$efi" = "32" ]; then
-			grubcfg=hd/boot/grub/i386-efi/grub.cfg
+			grubcfg=efi/boot/grub/i386-efi/grub.cfg
 			bootefi=bootia32.efi
 		else
-			grubcfg=hd/boot/grub/x86_64-efi/grub.cfg
+			grubcfg=efi/boot/grub/x86_64-efi/grub.cfg
 			bootefi=BOOTx64.EFI
 		fi
-		mkdir -p `dirname $grubcfg` hd/efi/Android
-		cp -af grub2/efi/boot/* hd/efi/Android
-		sed -i "s|VER|$VER|; s|CMDLINE|$cmdline|" hd/efi/Android/android.cfg
+		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
 
 		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 hd/efi/Android
+			cp -f src/kernel src/initrd.img efi/efi/Android
 			echo -e "set kdir=/efi/Android\nset src=SRC=/$asrc" >> $grubcfg
 		else
 			echo -e "set kdir=/$asrc" >> $grubcfg
@@ -366,9 +367,6 @@ install_to()
 			[ $? -eq 0 ] && while read entry; do efibootmgr -Bb "$entry" > /dev/tty4 2>&1; done < /tmp/efientries
 		fi
 		efibootmgr -v -c -d /dev/$disk -p $bootp -L "Android-x86 $VER" -l /efi/Android/$bootefi > /dev/tty4 2>&1
-
-		mountpoint -q /hd && umount /hd
-		try_mount rw /dev/$1 /hd
 	fi
 
 	dialog --title " Question " --defaultno --yesno \
-- 
2.11.0