From 419460ac4942ca57ea7f4ca658d56153b15e1428 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 7 May 2020 00:10:18 +0800
Subject: [PATCH] 1-install: move try_upgrade to an earlier step

The try_upgrade should be run before checking whether system
was installed as the read-write mode.
---
 install/scripts/1-install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install/scripts/1-install b/install/scripts/1-install
index 16711f1..1e39375 100644
--- a/install/scripts/1-install
+++ b/install/scripts/1-install
@@ -484,6 +484,8 @@ install_to()
 		fi
 	fi
 
+	try_upgrade hd/$asrc
+
 	! test -f hd/$asrc/system.img -o -d hd/$asrc/system
 	set_answer_if_auto $?
 	adialog --title " Question " --defaultno --yesno \
@@ -505,7 +507,7 @@ 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*
-- 
2.11.0