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

Re: [PATCH 2/2] Do not check size of swap partition(s) on s390 (#475358)



On Thu, 19 Aug 2010, Steffen Maier wrote:

On 08/19/2010 01:11 AM, dcantrell redhat com wrote:
From: David Cantrell <dcantrell redhat com>

Only warn if the user has not created a swap partition, but as long as
they have a swap partition of some size, do not enforce a minimum size.
---
 partitions.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/partitions.py b/partitions.py
index f7473cc..52d0b8c 100644
--- a/partitions.py
+++ b/partitions.py
@@ -1253,7 +1253,8 @@ class Partitions:
             mem = mem + (16384 - rem)
         mem = mem / 1024

-        if foundSwap and (swapSize < (mem - 8)) and (mem < 1024):
+        if foundSwap and rhpl.getArch() != "s390" and \

I guess this needs to be:
if foundSwap and (not rhpl.getArch() in ['s390', 's390x']) and \

Nope, sure doesn't.  From the rhpl source on RHEL-5:

def getArch ():
    import os
    arch = os.uname ()[4]
    if (len (arch) == 4 and arch[0] == 'i' and
        arch[2:4] == "86"):
        arch = "i386"

    if arch == "sparc64":
        arch = "sparc"

    if arch == "ppc64":
        arch = "ppc"

    if arch == "s390x":
        arch = "s390"

    return arch

+           (swapSize < (mem - 8)) and (mem < 1024):
             warnings.append(_("You have allocated less swap space (%dM) than "
                               "available RAM (%dM) on your system.  This "
                               "could negatively impact performance.")

--
David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI


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