From d4cb1f7eace0de59b02ec241e82e0e64959f923d Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Wed, 12 Jun 2024 20:33:31 +0200
Subject: [PATCH] fix memory requirements

---
 usr/lib/archboot/login.sh            | 14 +++++++-------
 usr/lib/archboot/update/update.sh    |  2 +-
 usr/share/archboot/doc/archboot.html |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index 89c3a88fe..5d5640cec 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -92,7 +92,7 @@ _run_latest_install() {
 _run_update_installer() {
     cd /
     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
         else
             # local image
@@ -149,16 +149,16 @@ if [[ -e /usr/bin/setup ]]; then
     if ! [[ -e /.launcher ]]; then
         launcher
     fi
-# latest image, fail if less than 2GB RAM available
-elif [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 1970000 ]]; then
+# 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 2270000 ]]; then
     _welcome
-    _memory_error "2.0GB"
+    _memory_error "2.3GB"
     _enter_shell
-# local image, fail if less than 2.6GB  RAM available
-elif [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 2571000 &&\
+# 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 2971000 &&\
 -e "${_LOCAL_DB}" ]]; then
     _welcome
-    _memory_error "2.6GB"
+    _memory_error "2.9GB"
     _enter_shell
 else
     _welcome
diff --git a/usr/lib/archboot/update/update.sh b/usr/lib/archboot/update/update.sh
index c77888300..024e5f171 100644
--- a/usr/lib/archboot/update/update.sh
+++ b/usr/lib/archboot/update/update.sh
@@ -60,7 +60,7 @@ usage () {
         fi
     fi
     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
                 echo -e " \e[1m-latest\e[m          Launch latest archboot environment (using kexec)."
             fi
diff --git a/usr/share/archboot/doc/archboot.html b/usr/share/archboot/doc/archboot.html
index 9ebcf4498..5a4ef7985 100644
--- a/usr/share/archboot/doc/archboot.html
+++ b/usr/share/archboot/doc/archboot.html
@@ -148,7 +148,7 @@
 <tbody>
 <tr class="odd">
 <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="MyNo">&#10006;</td>
@@ -162,7 +162,7 @@
 </tr>
 <tr class="odd">
 <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>