fix memory requirements

This commit is contained in:
Tobias Powalowski 2024-06-12 20:33:31 +02:00
parent 45e667efe7
commit d4cb1f7eac
3 changed files with 10 additions and 10 deletions

View file

@ -92,7 +92,7 @@ _run_latest_install() {
_run_update_installer() { _run_update_installer() {
cd / cd /
if [[ "${TTY}" == "tty1" ]]; then if [[ "${TTY}" == "tty1" ]]; then
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 2571000 ]]; then if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 2971000 ]]; then
_run_latest _run_latest
else else
# local image # local image
@ -149,16 +149,16 @@ if [[ -e /usr/bin/setup ]]; then
if ! [[ -e /.launcher ]]; then if ! [[ -e /.launcher ]]; then
launcher launcher
fi fi
# latest image, fail if less than 2GB RAM available # latest image, fail if less than 2.3GB RAM available
elif [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 1970000 ]]; then elif [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 2270000 ]]; then
_welcome _welcome
_memory_error "2.0GB" _memory_error "2.3GB"
_enter_shell _enter_shell
# local image, fail if less than 2.6GB RAM available # local image, fail if less than 3.0GB RAM available
elif [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 2571000 &&\ elif [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 2971000 &&\
-e "${_LOCAL_DB}" ]]; then -e "${_LOCAL_DB}" ]]; then
_welcome _welcome
_memory_error "2.6GB" _memory_error "2.9GB"
_enter_shell _enter_shell
else else
_welcome _welcome

View file

@ -60,7 +60,7 @@ usage () {
fi fi
fi fi
if ! [[ -e "${_LOCAL_DB}" ]] || [[ -e "${_LOCAL_DB}" && ! -e "/usr/bin/setup" ]]; then if ! [[ -e "${_LOCAL_DB}" ]] || [[ -e "${_LOCAL_DB}" && ! -e "/usr/bin/setup" ]]; then
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 1970000 ]]; then if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 2270000 ]]; then
if ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then if ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
echo -e " \e[1m-latest\e[m Launch latest archboot environment (using kexec)." echo -e " \e[1m-latest\e[m Launch latest archboot environment (using kexec)."
fi fi

View file

@ -148,7 +148,7 @@
<tbody> <tbody>
<tr class="odd"> <tr class="odd">
<td><strong><em>date</em></strong></td> <td><strong><em>date</em></strong></td>
<td>700M</td> <td>830M</td>
<td class="MyYes">&#10004;</td> <td class="MyYes">&#10004;</td>
<td class="MyYes">&#10004;</td> <td class="MyYes">&#10004;</td>
<td class="MyNo">&#10006;</td> <td class="MyNo">&#10006;</td>
@ -162,7 +162,7 @@
</tr> </tr>
<tr class="odd"> <tr class="odd">
<td><strong><em>date</em>-local</strong></td> <td><strong><em>date</em>-local</strong></td>
<td>2700M</td> <td>3000M</td>
<td class="MyYes">&#10004;</td> <td class="MyYes">&#10004;</td>
<td class="MyYes">&#10004;</td> <td class="MyYes">&#10004;</td>
<td class="MyYes">&#10004;</td> <td class="MyYes">&#10004;</td>