mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 01:17:35 +02:00
Add: Prompt has been added dealing with user error
Remove: The LUKS logfile created at user's /home directory has been removed
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Amelia Installer
|
# Amelia Installer
|
||||||
# Source: https://gitlab.com/prism7/archery
|
# Source: https://gitlab.com/prism7/archery
|
||||||
# Version: 9.5.1
|
# Version: 9.5.2
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -2721,6 +2721,7 @@ Enter a number: "
|
|||||||
###################################################################################################
|
###################################################################################################
|
||||||
ask_optm() {
|
ask_optm() {
|
||||||
|
|
||||||
|
local prompt="Optimizations"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
@@ -2738,9 +2739,13 @@ Enter [y/N]: "
|
|||||||
|
|
||||||
if [[ "${askoptm}" == "n" ]]; then
|
if [[ "${askoptm}" == "n" ]]; then
|
||||||
skip
|
skip
|
||||||
else
|
elif [[ "${askoptm}" == "y" ]]; then
|
||||||
return 0
|
return 0
|
||||||
|
else
|
||||||
|
invalid
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
|
ok
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
cust_kern_param() {
|
cust_kern_param() {
|
||||||
@@ -7399,16 +7404,6 @@ CUSTOMSERV
|
|||||||
foreign
|
foreign
|
||||||
optimizations
|
optimizations
|
||||||
secboot_sign
|
secboot_sign
|
||||||
if [[ -n "${CRYPTPASS}" ]]; then
|
|
||||||
local stage_prompt="Saving LUKS logfile at /home"
|
|
||||||
if arch-chroot /mnt <<-SAVEPASS > "${void}" 2>&1 2> "${log}" ; then
|
|
||||||
echo "Your LUKS password is: ${CRYPTPASS}" | tee /home/${USERNAME}/Luks.log || exit
|
|
||||||
SAVEPASS
|
|
||||||
stage_ok
|
|
||||||
else
|
|
||||||
stage_fail
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
completion
|
completion
|
||||||
installation="ok"
|
installation="ok"
|
||||||
umount -R /mnt
|
umount -R /mnt
|
||||||
|
|||||||
Reference in New Issue
Block a user