From b759f7c97e077be420a14aca85360542ba2ed79d Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 14 Apr 2021 20:11:51 +0200 Subject: [PATCH] fixes --- modules/disk/bios/config | 20 ++++++++++---------- modules/disk/uefi/config | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/disk/bios/config b/modules/disk/bios/config index 3083b97..2e442b8 100644 --- a/modules/disk/bios/config +++ b/modules/disk/bios/config @@ -118,18 +118,18 @@ fi ramsize="$(($(getconf _PHYS_PAGES) * $(getconf PAGE_SIZE) / (1024 * 1024)))" ramsize="$(awk "BEGIN { printf(\"%.0f\n\", ${ramsize}/1024); }")" -if [[ "${ramsize}" -le "2" ]]; then - test -z "${hibernate}" && swapsize="$(( ramsize * 2 ))" - test -z "${hibernate}" || swapsize="$(( ramsize * 3 ))" -elif [[ "${ramsize}" -gt "2" ]] && [[ "${ramsize}" -le "7" ]]; then - test -z "${hibernate}" && swapsize="${ramsize}" - test -z "${hibernate}" || swapsize="$(( ramsize * 2 ))" +if [[ "${ramsize}" -gt "0" ]] || [[ "${ramsize}" -le "2" ]]; then + test -z "${hibernate}" && swapsize="$(( ramsize * 2 ))" + test -z "${hibernate}" || swapsize="$(( ramsize * 3 ))" +elif [[ "${ramsize}" -gt "2" ]] && [[ "${ramsize}" -le "8" ]]; then + test -z "${hibernate}" && swapsize="${ramsize}" + test -z "${hibernate}" || swapsize="$(( ramsize * 2 ))" elif [[ "${ramsize}" -gt "8" ]] && [[ "${ramsize}" -le "15" ]]; then - test -z "${hibernate}" && swapsize="${ramsize}" - test -z "${hibernate}" || swapsize="$(awk "BEGIN { printf(\"%.0f\n\", ${ramsize}*1.5); }")" + test -z "${hibernate}" && swapsize="${ramsize}" + test -z "${hibernate}" || swapsize="$(awk "BEGIN { printf(\"%.0f\n\", ${ramsize}*1.5); }")" elif [[ "${ramsize}" -gt "15" ]]; then - test -z "${hibernate}" && swapsize="4" - test -z "${hibernate}" || read -p "hibernate not recommended, turning off" empty && hibernate="" + test -z "${hibernate}" && swapsize="4" + test -z "${hibernate}" || read -p "hibernate not recommended, turning off" empty && hibernate="" && swapsize="4" fi if [[ "${cfg[fde_key_store]}" == "once" ]]; then diff --git a/modules/disk/uefi/config b/modules/disk/uefi/config index 3083b97..91b7787 100644 --- a/modules/disk/uefi/config +++ b/modules/disk/uefi/config @@ -118,18 +118,18 @@ fi ramsize="$(($(getconf _PHYS_PAGES) * $(getconf PAGE_SIZE) / (1024 * 1024)))" ramsize="$(awk "BEGIN { printf(\"%.0f\n\", ${ramsize}/1024); }")" -if [[ "${ramsize}" -le "2" ]]; then - test -z "${hibernate}" && swapsize="$(( ramsize * 2 ))" - test -z "${hibernate}" || swapsize="$(( ramsize * 3 ))" -elif [[ "${ramsize}" -gt "2" ]] && [[ "${ramsize}" -le "7" ]]; then - test -z "${hibernate}" && swapsize="${ramsize}" - test -z "${hibernate}" || swapsize="$(( ramsize * 2 ))" +if [[ "${ramsize}" -gt "0" ]] || [[ "${ramsize}" -le "2" ]]; then + test -z "${hibernate}" && swapsize="$(( ramsize * 2 ))" + test -z "${hibernate}" || swapsize="$(( ramsize * 3 ))" +elif [[ "${ramsize}" -gt "2" ]] && [[ "${ramsize}" -le "8" ]]; then + test -z "${hibernate}" && swapsize="${ramsize}" + test -z "${hibernate}" || swapsize="$(( ramsize * 2 ))" elif [[ "${ramsize}" -gt "8" ]] && [[ "${ramsize}" -le "15" ]]; then - test -z "${hibernate}" && swapsize="${ramsize}" - test -z "${hibernate}" || swapsize="$(awk "BEGIN { printf(\"%.0f\n\", ${ramsize}*1.5); }")" + test -z "${hibernate}" && swapsize="${ramsize}" + test -z "${hibernate}" || swapsize="$(awk "BEGIN { printf(\"%.0f\n\", ${ramsize}*1.5); }")" elif [[ "${ramsize}" -gt "15" ]]; then - test -z "${hibernate}" && swapsize="4" - test -z "${hibernate}" || read -p "hibernate not recommended, turning off" empty && hibernate="" + test -z "${hibernate}" && swapsize="4" + test -z "${hibernate}" || read -p "hibernate not recommended, turning off" empty && hibernate="" fi if [[ "${cfg[fde_key_store]}" == "once" ]]; then