From 60ca27b0319f8eec0f733b7508e96c4000030111 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 15 Oct 2020 16:19:27 -0400 Subject: [PATCH] pentoo-livecd: X fails below 700MB ram, so put a warning in there and don't auto start X --- .../files/{livecd-setpass-r7 => livecd-setpass-r8} | 8 +++++++- ...ivecd-2020.3-r6.ebuild => pentoo-livecd-2020.4.ebuild} | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) rename pentoo/pentoo-livecd/files/{livecd-setpass-r7 => livecd-setpass-r8} (89%) rename pentoo/pentoo-livecd/{pentoo-livecd-2020.3-r6.ebuild => pentoo-livecd-2020.4.ebuild} (95%) diff --git a/pentoo/pentoo-livecd/files/livecd-setpass-r7 b/pentoo/pentoo-livecd/files/livecd-setpass-r8 similarity index 89% rename from pentoo/pentoo-livecd/files/livecd-setpass-r7 rename to pentoo/pentoo-livecd/files/livecd-setpass-r8 index b60a8adbb..8b0e3273d 100644 --- a/pentoo/pentoo-livecd/files/livecd-setpass-r7 +++ b/pentoo/pentoo-livecd/files/livecd-setpass-r8 @@ -55,7 +55,13 @@ if ! sudo grep -q "${changeuser}:!" /etc/shadow; then else printf "Something went wrong, aborting password set. Please report this issue\n" fi -x_or_no +RAMSIZE=$(awk '/MemTotal/ {printf( "%.0f\n", int ( $2 / 1024 ) + 1)}' /proc/meminfo) +if [ "${RAMSIZE}" -gt "700" ]; then + x_or_no +else + printf "Your system doesn't have enough ram to run X properly. Please increase the amount of ram if possible.\n" + choose_x="n" +fi if [ "${choose_x}" = "y" ]; then printf "Remember to log in with user \"${changeuser}\" and the password you just set\n" printf "*Press any key to start X securely.*\n" diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2020.3-r6.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2020.4.ebuild similarity index 95% rename from pentoo/pentoo-livecd/pentoo-livecd-2020.3-r6.ebuild rename to pentoo/pentoo-livecd/pentoo-livecd-2020.4.ebuild index df159c873..74eedd76f 100644 --- a/pentoo/pentoo-livecd/pentoo-livecd-2020.3-r6.ebuild +++ b/pentoo/pentoo-livecd/pentoo-livecd-2020.4.ebuild @@ -37,7 +37,7 @@ src_install() { #/usr/sbin newsbin "${FILESDIR}"/flushchanges-2018.0 flushchanges newsbin "${FILESDIR}"/makemo-2020.3 makemo - newsbin "${FILESDIR}"/livecd-setpass-r7 livecd-setpass + newsbin "${FILESDIR}"/livecd-setpass-r8 livecd-setpass newinitd "${FILESDIR}"/binary-driver-handler.initd-2020.3-r1 binary-driver-handler