From f725af8f443bb9d9162fdc4e53e18f1b7bf7cb27 Mon Sep 17 00:00:00 2001
From: Suikan <26223147+suikan4github@users.noreply.github.com>
Date: Tue, 10 May 2022 21:25:51 +0900
Subject: [PATCH] Issue 38 : "Ready to reboot" message should be changed

https://github.com/suikan4github/kaiten-yaki/issues/38
---
 CHANGELOG.md                 |  1 +
 script/lib/common.sh         | 10 +++++-----
 script/ubuntu-kaiten-yaki.sh |  7 +++++++
 script/void-kaiten-yaki.sh   |  7 +++++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0337c3e..a40efae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Record of the modification in project development.
 ### Fixed
 - [Issue 32 : Ubuntu 22.04 fails to deactivate the swap](https://github.com/suikan4github/kaiten-yaki/issues/32)
 - [Issue 36 : Clear the PASSPHRASE variable at the end of installation](https://github.com/suikan4github/kaiten-yaki/issues/36)
+- [Issue 38 : "Ready to reboot" message should be changed](https://github.com/suikan4github/kaiten-yaki/issues/38)
 
 ### Known Issue
 
diff --git a/script/lib/common.sh b/script/lib/common.sh
index 2a34de0..829cbb4 100644
--- a/script/lib/common.sh
+++ b/script/lib/common.sh
@@ -395,12 +395,12 @@ function post_install() {
 	echo "...Unmounting all."
 	umount -R -l "${TARGETMOUNTPOINT}"
 
-	# Finishing message
-	cat <<- HEREDOC
-	****************** Post-install process finished ******************
+	echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
+	vgchange -a n "${VGNAME}"
+	echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
+	cryptsetup close  "${CRYPTPARTNAME}"
 
-	...Ready to reboot.
-	HEREDOC
+	echo "...Post install process finished."
 
 	return 0
 	
diff --git a/script/ubuntu-kaiten-yaki.sh b/script/ubuntu-kaiten-yaki.sh
index e3b4b5d..93952a6 100644
--- a/script/ubuntu-kaiten-yaki.sh
+++ b/script/ubuntu-kaiten-yaki.sh
@@ -75,6 +75,13 @@ function main() {
 	PASSPHRASE=""
 	export PASSPHRASE
 
+	# Finishing message
+	cat <<- HEREDOC
+	****************** Install process finished ******************
+
+	...Ready to reboot.
+	HEREDOC
+
 	# Normal end
 	return 0
 
diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh
index a49a378..4a9c899 100644
--- a/script/void-kaiten-yaki.sh
+++ b/script/void-kaiten-yaki.sh
@@ -90,6 +90,13 @@ function main() {
 	PASSPHRASE=""
 	export PASSPHRASE
 
+	# Finishing message
+	cat <<- HEREDOC
+	****************** Install process finished ******************
+
+	...Ready to reboot.
+	HEREDOC
+
 	# Normal end
 	return 0