Merge branch 'feature/36' into develop

This commit is contained in:
Suikan 2022-05-08 12:29:32 +09:00
commit 316131c2b3
4 changed files with 17 additions and 1 deletions

View file

@ -4,7 +4,7 @@ Record of the modification in project development.
## [Unreleased] - yyyy-mm-dd ## [Unreleased] - yyyy-mm-dd
### Added ### Added
- [Issue 31 : Add extra partition functionality.](https://github.com/suikan4github/kaiten-yaki/issues/31) - [Issue 31 : Add extra partition functionality.](https://github.com/suikan4github/kaiten-yaki/issues/31)
- [Issue 35 : Support "M/G/T" as size prefix.](https://github.com/suikan4github/kaiten-yaki/issues/35) - [Issue 33 : Support "M/G/T" as size prefix.](https://github.com/suikan4github/kaiten-yaki/issues/33)
### Changed ### Changed
### Deprecated ### Deprecated
@ -15,6 +15,7 @@ Record of the modification in project development.
### Fixed ### Fixed
- [Issue 32 : Ubuntu 22.04 fails to deactivate the swap](https://github.com/suikan4github/kaiten-yaki/issues/32) - [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)
### Known Issue ### Known Issue

View file

@ -139,6 +139,9 @@ function confirmation(){
...Installation process terminated.. ...Installation process terminated..
HEREDOC HEREDOC
return 1 # with error status return 1 # with error status
else
# Clear the PASSPHRASE for checking because we don't use it anymore.
PASSPHRASE_C=""
fi # passphrase validation fi # passphrase validation

View file

@ -67,8 +67,14 @@ function main() {
post_install post_install
# Free LUKS volume as swap volume. # Free LUKS volume as swap volume.
echo "...Disabling swap to release the LUKS volume."
swapoff -a swapoff -a
# Deleting the passphrase information.
echo "...Deleting passphrase information."
PASSPHRASE=""
export PASSPHRASE
# Normal end # Normal end
return 0 return 0

View file

@ -82,8 +82,14 @@ function main() {
post_install post_install
# Free LUKS volume as swap volume. # Free LUKS volume as swap volume.
echo "...Disabling swap to release the LUKS volume."
swapoff -a swapoff -a
# Deleting the passphrase information.
echo "...Deleting passphrase information."
PASSPHRASE=""
export PASSPHRASE
# Normal end # Normal end
return 0 return 0