root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

add error message and additional swap check

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 17:34:42 +01:00
parent 1bf77bf482
commit cf830beff8
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
usr/lib/archboot/installer/mountpoints.sh
View file

@ -166,7 +166,7 @@ _mountpoints() {
while [[ "${_DEV}" != "DONE" ]]; do
#shellcheck disable=SC2086
if [[ -n "${_DO_SWAP}" ]]; then
_dialog --menu "Select the SWAP device:" 15 45 12 NONE - ${_DEVS} 2>"${_ANSWER}" || return 1
_dialog --menu "Select the SWAP PARTITION:" 15 45 12 NONE - ${_DEVS} 2>"${_ANSWER}" || return 1
elif [[ -n "${_DO_ROOT}" ]]; then
_dialog --menu "Select the ROOT DEVICE /:" 15 45 12 ${_DEVS} 2>"${_ANSWER}" || return 1
elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
@ -202,9 +202,18 @@ _mountpoints() {
_FSTYPE="vfat"
_DOMKFS=1
fi
# don't format ESP, if already vfat format
if [[ "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
_SKIP_FILESYSTEM="1"
fi
# allow reformat. if already vfat format
if [[ -z "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
[[ "${_FSTYPE}" == "vfat" ]] && _FSTYPE=""
fi
else
if [[ -n "${_DO_SWAP}" ]]; then
if [[ -n "${_DO_SWAP}" && ! "${_DEV}" == "NONE" ]]; then
if ! [[ "${_FSTYPE}" == "swap" ]]; then
_dialog --msgbox "Error: SWAP PARTITION has not a swap filesystem." 5 50
return 1
else
_DO_SWAP=""
@ -213,6 +222,7 @@ _mountpoints() {
_DO_ROOT=""
elif [[ -n "${_DO_UEFISYSDEV}" ]]; then
if ! [[ "${_FSTYPE}" == "vfat" ]]; then
_dialog --msgbox "Error: EFI SYSTEM PARTITION has not a vfat filesystem." 5 50
return 1
else
_DO_UEFISYSDEV=""
@ -220,14 +230,6 @@ _mountpoints() {
fi
_SKIP_FILESYSTEM=1
fi
# don't format ESP, if already vfat format
if [[ "${_FSTYPE}" == "vfat" && -n "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
_SKIP_FILESYSTEM="1"
fi
# allow reformat. if already vfat format
if [[ -z "${_DO_UEFISYSDEV}" && -z "${_DO_ROOT}" ]]; then
[[ "${_FSTYPE}" == "vfat" ]] && _FSTYPE=""
fi
# _ASK_MOUNTPOINTS switch for create filesystem and only mounting filesystem
if [[ -n "${_ASK_MOUNTPOINTS}" && -z "${_SKIP_FILESYSTEM}" ]]; then
_enter_mountpoint || return 1