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

allow no swap on quicksetup

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-27 09:57:54 +02:00
parent 9e9614927c
commit 6fc8832906
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

@ -237,7 +237,7 @@ _autoprepare() {
_SWAP_SIZE="256" _SWAP_SIZE="256"
[[ "${_DISK_SIZE}" -lt "256" ]] && _SWAP_SIZE="${_DISK_SIZE}" [[ "${_DISK_SIZE}" -lt "256" ]] && _SWAP_SIZE="${_DISK_SIZE}"
while [[ -z "${_SWAPDEV_SET}" ]]; do while [[ -z "${_SWAPDEV_SET}" ]]; do
_dialog --title " Swap In MiB " --no-cancel --inputbox "0=Create no swap partition. Disk space left: ${_DISK_SIZE}M" 8 55 "${_SWAP_SIZE}" 2>"${_ANSWER}" || return 1 _dialog --title " Swap In MiB " --no-cancel --inputbox "0=Skip Swap partition. Disk space left: ${_DISK_SIZE}M" 8 55 "${_SWAP_SIZE}" 2>"${_ANSWER}" || return 1
_SWAPDEV_SIZE=$(cat "${_ANSWER}") _SWAPDEV_SIZE=$(cat "${_ANSWER}")
if [[ -z "${_SWAPDEV_SIZE}" ]]; then if [[ -z "${_SWAPDEV_SIZE}" ]]; then
_dialog --title " ERROR " --no-mouse --infobox "You have entered an invalid size, please enter again." 3 60 _dialog --title " ERROR " --no-mouse --infobox "You have entered an invalid size, please enter again." 3 60
@ -246,7 +246,7 @@ _autoprepare() {
if [[ "${_SWAPDEV_SIZE}" -ge "${_DISK_SIZE}" ]]; then if [[ "${_SWAPDEV_SIZE}" -ge "${_DISK_SIZE}" ]]; then
_dialog --title " ERROR " --no-mouse --infobox "You have entered a too large size, please enter again." 3 60 _dialog --title " ERROR " --no-mouse --infobox "You have entered a too large size, please enter again." 3 60
sleep 5 sleep 5
elif [[ "${_SWAPDEV_SIZE}" -ge "${_DISK_SIZE}" ]]; then elif [[ "${_SWAPDEV_SIZE}" == "0" ]]; then
_SWAPDEV_SET=1 _SWAPDEV_SET=1
_NO_SWAP=1 _NO_SWAP=1
else else