Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 10:31:17 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/8' into develop

Browse source
This commit is contained in:
Suikan 2021-07-04 16:35:20 +09:00
commit 8f8aecd275
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -11,6 +11,7 @@ Record of the modification in project development.
### Deprecated ### Deprecated
### Removed ### Removed
### Fixed ### Fixed
- [Issue 8 : Wrong message after cancellation ](https://github.com/suikan4github/kaiten-yaki/8)
### Known Issue ### Known Issue

6
script/lib.sh
View file

@ -294,13 +294,15 @@ function deactivate_and_close(){
# ******************************************************************************* # *******************************************************************************
function on_unexpected_installer_quit(){ function on_unexpected_installer_quit(){
echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****" echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****"
if [ "${OVERWRITEINSTALL}" -eq 0 ] ; then # If not over install, volume is new. So delete it if [ "${OVERWRITEINSTALL}" -ne 0 ] ; then # If overwrite install, keep the volume
echo "...Keep logical volume \"${VGNAME}-${LVROOTNAME}\" untouched."
else # if not overwrite istall, delete the new volume
echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"." echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"."
lvremove -f /dev/mapper/"${VGNAME}"-"${LVROOTNAME}" lvremove -f /dev/mapper/"${VGNAME}"-"${LVROOTNAME}"
fi fi
# Deactivate all lg and close the LUKS volume # Deactivate all lg and close the LUKS volume
deactivate_and_close deactivate_and_close
echo "...The new logical volume has been deleted. You can retry Kaiten-yaki again." echo "...You can retry Kaiten-yaki again."
} }