root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix memory requirements

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

14
usr/lib/archboot/login.sh
View file

@ -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

2
usr/lib/archboot/update/update.sh
View file

@ -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

4
usr/share/archboot/doc/archboot.html
View file

@ -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>