[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[master] memory: decrease the GUI limits a bit.



---
 anaconda     |    2 +-
 isys/isys.c  |    1 +
 isys/isys.h  |    3 ++-
 isys/isys.py |    1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/anaconda b/anaconda
index b5532b0..af90e09 100755
--- a/anaconda
+++ b/anaconda
@@ -382,7 +382,7 @@ def check_memory(anaconda, opts, display_mode=None):
 
     # override display mode if machine cannot nicely run X
     if display_mode not in ('t', 'c') and not flags.usevnc:
-        needed_ram = isys.MIN_GUI_RAM + extra_ram
+        needed_ram = needed_ram + isys.GUI_INSTALL_EXTRA_RAM
 
         if not within_available_memory(needed_ram):
             complain = _("You do not have enough RAM to use the graphical "
diff --git a/isys/isys.c b/isys/isys.c
index 409170b..ca3fb0d 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -313,6 +313,7 @@ void init_isys(void) {
 
     PyDict_SetItemString(d, "MIN_RAM", PyInt_FromLong(MIN_RAM));
     PyDict_SetItemString(d, "MIN_GUI_RAM", PyInt_FromLong(MIN_GUI_RAM));
+    PyDict_SetItemString(d, "GUI_INSTALL_EXTRA_RAM", PyInt_FromLong(GUI_INSTALL_EXTRA_RAM));
     PyDict_SetItemString(d, "URL_INSTALL_EXTRA_RAM", PyInt_FromLong(URL_INSTALL_EXTRA_RAM));
     PyDict_SetItemString(d, "EARLY_SWAP_RAM", PyInt_FromLong(EARLY_SWAP_RAM));
 }
diff --git a/isys/isys.h b/isys/isys.h
index e3cb1fc..811b51b 100644
--- a/isys/isys.h
+++ b/isys/isys.h
@@ -21,8 +21,9 @@
 #define H_ISYS
 
 #define MIN_RAM			262144 // 256 MB
-#define MIN_GUI_RAM		524288 // 512 MB
+#define GUI_INSTALL_EXTRA_RAM   131072 // 128 MB
 #define URL_INSTALL_EXTRA_RAM   131072 // 128 MB
+#define MIN_GUI_RAM		MIN_RAM + GUI_INSTALL_EXTRA_RAM
 #define EARLY_SWAP_RAM		524288
 
 #define OUTPUT_TERMINAL "/dev/tty5"
diff --git a/isys/isys.py b/isys/isys.py
index 62010ff..cddb916 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -62,6 +62,7 @@ mountCount = {}
 
 MIN_RAM = _isys.MIN_RAM
 MIN_GUI_RAM = _isys.MIN_GUI_RAM
+GUI_INSTALL_EXTRA_RAM = _isys.GUI_INSTALL_EXTRA_RAM
 URL_INSTALL_EXTRA_RAM = _isys.URL_INSTALL_EXTRA_RAM
 EARLY_SWAP_RAM = _isys.EARLY_SWAP_RAM
 
-- 
1.6.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]