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

rephrase skipping dialogs

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-27 21:28:12 +02:00
parent f9d0558e19
commit fbdc48470d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/installer/quicksetup.sh
View file

@ -247,7 +247,7 @@ _autoprepare() {
_SWAP_SIZE="256"
[[ "${_DISK_SIZE}" -lt "256" ]] && _SWAP_SIZE="${_DISK_SIZE}"
while [[ -z "${_SWAPDEV_SET}" ]]; do
_dialog --title " Swap In MiB " --no-cancel --inputbox "Disk space left: ${_DISK_SIZE}M | Value 0 skips Swap" 8 70 "${_SWAP_SIZE}" 2>"${_ANSWER}" || return 1
_dialog --title " Swap In MiB " --no-cancel --inputbox "Disk space left: ${_DISK_SIZE}M | Value 0 skips Swap" 8 55 "${_SWAP_SIZE}" 2>"${_ANSWER}" || return 1
_SWAPDEV_SIZE=$(cat "${_ANSWER}")
if [[ -z "${_SWAPDEV_SIZE}" ]]; then
_dialog --title " ERROR " --no-mouse --infobox "You have entered an invalid size, please enter again." 3 60
@ -281,7 +281,7 @@ _autoprepare() {
_ROOTDEV_NUM="$((_DEV_NUM+1))"
_DEV_NUM="${_ROOTDEV_NUM}"
while [[ -z "${_ROOTDEV_SET}" ]]; do
_dialog --title " / in MiB " --inputbox "Disk space left: $((_DISK_SIZE-350))M | Minimum value is 2000\nValue 0 skips /home and uses the whole ${_DISK_SIZE}M for /" 9 70 "${_ROOT_SIZE}" 2>"${_ANSWER}" || return 1
_dialog --title " / in MiB " --inputbox "Disk space left: $((_DISK_SIZE-350))M | Minimum value is 2000\nValue 0 skips /home and uses the left ${_DISK_SIZE}M for /" 9 70 "${_ROOT_SIZE}" 2>"${_ANSWER}" || return 1
_ROOTDEV_SIZE=$(cat "${_ANSWER}")
if [[ "${_ROOTDEV_SIZE}" == 0 ]]; then
if _dialog --yesno "${_DISK_SIZE}M will be used for your / partition. Is this OK?" 0 0; then