From be82a4e6de04955bdb710a710a8deb6f188ea6e5 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 6 Jun 2022 10:40:37 +0200
Subject: [PATCH] readd x86_64 memory gap

---
 usr/lib/archboot/login.sh            | 12 ++++++++++--
 usr/lib/archboot/update-installer.sh |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index 6140547f6..3b9f7e1dd 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -100,12 +100,20 @@ elif [[ "$(uname -m)" == "aarch64" && "$(grep -w MemTotal /proc/meminfo | cut -d
 "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4210000 ]]; then
     _welcome
     echo -e "\033[1m\033[91mMemory check failed:\033[0m"
-    echo -e "\033[91m- Memory gap detected: \033[1m3950M - 4.299M RAM\033[0m"
+    echo -e "\033[91m- Kexec memory gap detected: \033[1m3950M - 4.299M RAM\033[0m"
+    echo -e "\033[91m- Possibility of not working \033[1mkexec\033[0m\033[91m boot is given.\033[0m"
+    echo -e "\033[93m- Please use \033[1mmore\033[0m\033[93m or \033[1mless\033[0m\033[93m RAM.\033[0m"
+    echo -e "\033[91mAborting ...\033[0m"
+    _enter_shell
+elif [[ "$(uname -m)" == "x86_64" && "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 4670000 &&\
+"$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4210000 ]]; then
+    _welcome
+    echo -e "\033[1m\033[91mMemory check failed:\033[0m"
+    echo -e "\033[91m- Kexec memory gap detected: \033[1m4750M - 5099M RAM\033[0m"
     echo -e "\033[91m- Possibility of not working \033[1mkexec\033[0m\033[91m boot is given.\033[0m"
     echo -e "\033[93m- Please use \033[1mmore\033[0m\033[93m or \033[1mless\033[0m\033[93m RAM.\033[0m"
     echo -e "\033[91mAborting ...\033[0m"
     _enter_shell
-
 else
     _welcome
     _run_update_installer
diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh
index 1f288cab9..0a76f3da5 100644
--- a/usr/lib/archboot/update-installer.sh
+++ b/usr/lib/archboot/update-installer.sh
@@ -43,6 +43,7 @@ usage () {
                 if ! [[ -e "/.graphic_run" ]]; then
                     _graphic_options
                     echo -e " \033[1m-launch-xfce\033[0m     Launch XFCE desktop with VNC sharing enabled."
+                    echo ""
                 fi
             fi
         else