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

[PATCH 2/7] URL installs no longer have special memory requirements.



Add that 128M into the MIN_RAM and MIN_GUI_RAM numbers.

Related: rhbz#604614
---
 anaconda     |    9 ++-------
 isys/isys.c  |    1 -
 isys/isys.h  |    5 ++---
 isys/isys.py |    1 -
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/anaconda b/anaconda
index aabb809..1e32373 100755
--- a/anaconda
+++ b/anaconda
@@ -376,13 +376,8 @@ def check_memory(opts, display_mode=None):
     if not display_mode:
         display_mode = opts.display_mode
 
-    extra_ram = 0
     reason = ''
-    if opts.stage2 and opts.stage2.startswith(('http', 'ftp', '@')):
-        extra_ram += isys.URL_INSTALL_EXTRA_RAM
-        reason = " using this install method"
-
-    needed_ram = isys.MIN_RAM + extra_ram
+    needed_ram = isys.MIN_RAM
     if not within_available_memory(needed_ram):
         from snack import SnackScreen, ButtonChoiceWindow
         screen = SnackScreen()
@@ -398,7 +393,7 @@ def check_memory(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 = isys.MIN_GUI_RAM
 
         if not within_available_memory(needed_ram):
             stdoutLog.warning(_("You do not have enough RAM to use the graphical "
diff --git a/isys/isys.c b/isys/isys.c
index 2694641..6a2d18d 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -315,7 +315,6 @@ 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, "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 e49347a..15b9298 100644
--- a/isys/isys.h
+++ b/isys/isys.h
@@ -20,9 +20,8 @@
 #ifndef H_ISYS
 #define H_ISYS
 
-#define MIN_RAM			262144 // 256 MB
-#define MIN_GUI_RAM		524288 // 512 MB
-#define URL_INSTALL_EXTRA_RAM   131072 // 128 MB
+#define MIN_RAM			393216 // 384 MB
+#define MIN_GUI_RAM		655360 // 640 MB
 #define EARLY_SWAP_RAM		524288
 
 #define OUTPUT_TERMINAL "/dev/tty5"
diff --git a/isys/isys.py b/isys/isys.py
index 449ba5c..4240c20 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -64,7 +64,6 @@ mountCount = {}
 
 MIN_RAM = _isys.MIN_RAM
 MIN_GUI_RAM = _isys.MIN_GUI_RAM
-URL_INSTALL_EXTRA_RAM = _isys.URL_INSTALL_EXTRA_RAM
 EARLY_SWAP_RAM = _isys.EARLY_SWAP_RAM
 
 ## Get the amount of free space available under a directory path.
-- 
1.7.3.4


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