From 468db68b68e99db294fcba3e1bfe01ae94bfba15 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 27 Aug 2023 17:37:16 +0200 Subject: [PATCH] =?UTF-8?q?allow=20/home=20on=20/=20in=20quicksetu=C3=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- usr/lib/archboot/installer/quicksetup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr/lib/archboot/installer/quicksetup.sh b/usr/lib/archboot/installer/quicksetup.sh index caff769df..4521a97fc 100644 --- a/usr/lib/archboot/installer/quicksetup.sh +++ b/usr/lib/archboot/installer/quicksetup.sh @@ -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 will skip Swap partition creation" 8 70 "${_SWAP_SIZE}" 2>"${_ANSWER}" || return 1 + _dialog --title " Swap In MiB " --no-cancel --inputbox "Disk space left: ${_DISK_SIZE}M | Value 0 will skip Swap creation" 8 70 "${_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 @@ -277,10 +277,11 @@ _autoprepare() { # xfs minimum size is around 300M # btrfs minimum size is around 120M [[ "${_DISK_SIZE}" -lt "7500" ]] && _ROOT_SIZE="$((_DISK_SIZE-350))" + [[ "${_DISK_SIZE}" -lt "2000" ]] && _ROOT_SIZE=0 _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 will skip /home partition creation and use rest ${_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 will skip /home creation and use the rest ${_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