Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: David Lehman <dlehman <at> redhat.com>
Subject: [PATCH] Update the requirements for memory and combined memory and swap.
Newsgroups: gmane.linux.redhat.anaconda.devel
Date: Tuesday 26th April 2011 16:41:00 UTC (over 6 years ago)
New minimum for physical memory is 640MB. New minimum combined
swap and memory is 768MB.

Related: rhbz#696805
Related: rhbz#699770
---
 anaconda                    |    7 -------
 loader/loader.c             |   11 +----------
 pyanaconda/isys/__init__.py |    1 -
 pyanaconda/isys/isys.c      |    1 -
 pyanaconda/isys/mem.h       |    7 +++----
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/anaconda b/anaconda
index ac6ffcf..5fe84e6 100755
--- a/anaconda
+++ b/anaconda
@@ -335,9 +335,6 @@ def gtk_warning(title, reason):
 def check_memory(anaconda, opts, display_mode=None):
     reason_strict = _("%s requires %s MB of memory to install, but you
only have "
                       "%s MB on this machine.\n")
-    reason_method = _("%s requires %s MB of memory to install using this "
-                      "installation method, but you only have %s MB on
this "
-                      "machine.\n")
     reason_graphical = _("The %s graphical installer requires %s MB of
memory, but "
                          "you only have %s MB.")
 
@@ -354,10 +351,6 @@ def check_memory(anaconda, opts, display_mode=None):
 
     extra_ram = 0
     reason = reason_strict
-    if opts.stage2 and opts.stage2.startswith(('http', 'ftp', '@')):
-        extra_ram += isys.URL_INSTALL_EXTRA_RAM
-        reason = reason_method
-
     total_ram = int(isys.total_memory() / 1024)
     needed_ram = int((isys.MIN_RAM + extra_ram) / 1024)
 
diff --git a/loader/loader.c b/loader/loader.c
index 0aec9b5..7223ee9 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1195,19 +1195,10 @@ static void parseCmdLineFlags(struct loaderData_s *
loaderData,
 
 /* make sure they have enough ram */
 static void checkForRam(int install_method) {
-    char *reason_none = _("%s requires %d MB of memory, to install, but
you only have %d MB.");
-    char *reason_method = _("%s requires %d MB of memory to install using
this installation "
-                            "method, but you only have %d MB on this
machine.");
-
-    char* reason = reason_none;
+    char *reason = _("%s requires %d MB of memory, to install, but you
only have %d MB.");
     int needed = MIN_RAM;
     int installed = totalMemory();
 
-    if (install_method == METHOD_URL) {
-        needed += URL_INSTALL_EXTRA_RAM;
-        reason = reason_method;
-    }
-
     if (totalMemory() < needed) {
         char *buf;
         checked_asprintf(&buf, reason, getProductName(), needed/1024,
installed/1024);
diff --git a/pyanaconda/isys/__init__.py b/pyanaconda/isys/__init__.py
index b896569..3037921 100755
--- a/pyanaconda/isys/__init__.py
+++ b/pyanaconda/isys/__init__.py
@@ -74,7 +74,6 @@ 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
 
 ## Get the amount of free space available under a directory path.
diff --git a/pyanaconda/isys/isys.c b/pyanaconda/isys/isys.c
index e28fcad..33d72cc 100644
--- a/pyanaconda/isys/isys.c
+++ b/pyanaconda/isys/isys.c
@@ -255,7 +255,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, "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/pyanaconda/isys/mem.h b/pyanaconda/isys/mem.h
index d664144..feb0d90 100644
--- a/pyanaconda/isys/mem.h
+++ b/pyanaconda/isys/mem.h
@@ -25,12 +25,11 @@
   #define MIN_RAM                 1024*1024 // 1 GB
   #define GUI_INSTALL_EXTRA_RAM   512*1024  // 512 MB
 #else
-  #define MIN_RAM                 256 * 1024 // 256 MB
-  #define GUI_INSTALL_EXTRA_RAM   128 * 1024 // 128 MB
+  #define MIN_RAM                 640 * 1024 // 512 MB
+  #define GUI_INSTALL_EXTRA_RAM   0 * 1024 // 128 MB
 #endif
-#define URL_INSTALL_EXTRA_RAM   192 * 1024 // 192 MB
 #define MIN_GUI_RAM             MIN_RAM + GUI_INSTALL_EXTRA_RAM
-#define EARLY_SWAP_RAM          512 * 1024 // 512 MB
+#define EARLY_SWAP_RAM          768 * 1024 // 768 MB
 
 int totalMemory(void);
 
-- 
1.7.4.4
 
CD: 3ms