From 7ebd7fc535437a12617e992434eae5fcabe7d8a3 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Fri, 2 Jul 2021 13:51:53 +0900
Subject: [PATCH] Add volume closing on duplicate LV name.

---
 script/common/preinstall.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/script/common/preinstall.sh b/script/common/preinstall.sh
index 2251947..476435e 100644
--- a/script/common/preinstall.sh
+++ b/script/common/preinstall.sh
@@ -61,7 +61,7 @@ function pre_install() {
 	# Check volume group ${VGNAME} exist or not
 	if  vgdisplay -s ${VGNAME} &> /dev/null ; then		# if exist
 		echo "...Volume group ${VGNAME} already exist. Skipped to create. No problem."
-		echo "...Activate all logical volume in volume group ${VGNAME}."
+		echo "...Activate all logical volumes in volume group ${VGNAME}."
 		vgchange -ay
 	else
 		echo "...Initialize a physical volume on \"${CRYPTPARTNAME}\""
@@ -83,6 +83,12 @@ function pre_install() {
 		cat <<- HEREDOC 1>&2
 		***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" already exists. *****
 		...Check LVROOTNAME environment variable in config.txt.
+		HEREDOC
+		echo "...Deactivate all logical volumes in volume group \"${VGNAME}\"."
+		vgchange -a n ${VGNAME}
+		echo "...Close LUKS volume \"${CRYPTPARTNAME}\"."
+		cryptsetup close  ${CRYPTPARTNAME}
+		cat <<- HEREDOC 1>&2
 
 		...Installation process terminated..
 		HEREDOC