mirror of
https://github.com/suikan4github/kaiten-yaki.git
synced 2025-12-20 02:21:17 -03:00
Merge branch 'feature/27' into develop
This commit is contained in:
commit
9bf7f36be8
3 changed files with 14 additions and 37 deletions
|
|
@ -6,6 +6,7 @@ Record of the modification in project development.
|
||||||
### Changed
|
### Changed
|
||||||
- [Issue 25 : Refactoring: Sourcing config.sys is not needed in the chrooted_job](https://github.com/suikan4github/kaiten-yaki/issues/25)
|
- [Issue 25 : Refactoring: Sourcing config.sys is not needed in the chrooted_job](https://github.com/suikan4github/kaiten-yaki/issues/25)
|
||||||
- [Issue 26 : Update AN01 for btrfs](https://github.com/suikan4github/kaiten-yaki/issues/26)
|
- [Issue 26 : Update AN01 for btrfs](https://github.com/suikan4github/kaiten-yaki/issues/26)
|
||||||
|
- [Issue 27 : Eliminates the confirmation dialog](https://github.com/suikan4github/kaiten-yaki/issues/27)
|
||||||
|
|
||||||
### Deprecated
|
### Deprecated
|
||||||
### Removed
|
### Removed
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ In the case of Void Linux
|
||||||
```bash
|
```bash
|
||||||
source void-kaiten-yaki.sh
|
source void-kaiten-yaki.sh
|
||||||
```
|
```
|
||||||
After several interactive confirmations, Kaiten-yaki will ask you to input a passphrase. This passphrase will be applied to the encryption of the LUKS volume. Make sure you use identical passphrases between all installations of the distributions in a computer. Otherwise, the install process terminates with an error, except the first distribution installation.
|
After printing the configuration parameters, Kaiten-yaki will ask you to input a passphrase. This passphrase will be applied to the encryption of the LUKS volume. Make sure you use identical passphrases between all installations of the distributions in a computer. Otherwise, the install process terminates with an error, except the first distribution installation.
|
||||||
|
|
||||||
## Second stage : GUI/TUI installer
|
## Second stage : GUI/TUI installer
|
||||||
After the first script finishes, the GUI/TUI installer starts automatically. Configure it as usual and run it. Ensure you map the following correctly.
|
After the first script finishes, the GUI/TUI installer starts automatically. Configure it as usual and run it. Ensure you map the following correctly.
|
||||||
|
|
|
||||||
|
|
@ -57,46 +57,22 @@ function confirmation(){
|
||||||
# For surre ask the your config.sh is edited
|
# For surre ask the your config.sh is edited
|
||||||
cat <<- HEREDOC
|
cat <<- HEREDOC
|
||||||
|
|
||||||
The destination logical volume label is "${LVROOTNAME}"
|
LUKS volume partition : ${DEV}${CRYPTPARTITION}
|
||||||
"${LVROOTNAME}" uses ${LVROOTSIZE} of the LVM volume group.
|
LUKS volume name : "${CRYPTPARTNAME}"
|
||||||
Are you sure to install? [Y/N]
|
Volume group name : "${VGNAME}"
|
||||||
|
Root volume name : "${VGNAME}-${LVROOTNAME}"
|
||||||
|
Swap volume name : "${VGNAME}-${LVSWAPNAME}"
|
||||||
|
Size of "${VGNAME}-${LVROOTNAME}" : ${LVROOTSIZE}
|
||||||
HEREDOC
|
HEREDOC
|
||||||
read -r YESNO
|
|
||||||
if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
|
|
||||||
cat <<- HEREDOC
|
|
||||||
|
|
||||||
...Installation process terminated..
|
|
||||||
HEREDOC
|
|
||||||
return 1 # with error status
|
|
||||||
fi # if YES
|
|
||||||
|
|
||||||
# For sure ask to erase.
|
|
||||||
if [ "${ERASEALL}" -ne 0 ] ; then
|
if [ "${ERASEALL}" -ne 0 ] ; then
|
||||||
echo "Are you sure you want to erase entire \"${DEV}\"? [Y/N]"
|
echo "Going to erase entire disk ${DEV}."
|
||||||
read -r YESNO
|
elif [ "${OVERWRITEINSTALL}" -ne 0 ] ; then
|
||||||
if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
|
echo "Going to overwrite the logical volume \"${VGNAME}-${LVROOTNAME}\"."
|
||||||
cat <<-HEREDOC
|
else
|
||||||
...Check your config.sh. The variable ERASEALL is ${ERASEALL}.
|
echo "Going to create a new logical volume \"${VGNAME}-${LVROOTNAME}\"."
|
||||||
|
fi
|
||||||
|
|
||||||
...Installation process terminated..
|
|
||||||
HEREDOC
|
|
||||||
return 1 # with error status
|
|
||||||
fi # if YES
|
|
||||||
fi # if erase all
|
|
||||||
|
|
||||||
# For sure ask to overwrite.
|
|
||||||
if [ "${OVERWRITEINSTALL}" -ne 0 ] ; then
|
|
||||||
echo "Are you sure you want to overwrite \"${LVROOTNAME}\" in \"${VGNAME}\"? [Y/N]"
|
|
||||||
read -r YESNO
|
|
||||||
if [ "${YESNO}" != "Y" ] && [ "${YESNO}" != "y" ] ; then
|
|
||||||
cat <<-HEREDOC
|
|
||||||
...Check your config.sh. The variable OVERWRITEINSTALL is ${OVERWRITEINSTALL}.
|
|
||||||
|
|
||||||
...Installation process terminated..
|
|
||||||
HEREDOC
|
|
||||||
return 1 # with error status
|
|
||||||
fi # if YES
|
|
||||||
fi # if overwrite
|
|
||||||
|
|
||||||
# ----- Set Passphrase -----
|
# ----- Set Passphrase -----
|
||||||
# Input passphrase
|
# Input passphrase
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue