diff options
| author | Jeremy Katz <katzj@redhat.com> | 2001-11-12 20:48:27 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2001-11-12 20:48:27 +0000 |
| commit | dcd40049034b8894ae9ccc12b0a3a5d4cdbc7574 (patch) | |
| tree | dd37068a471b16285a9ac29a72a49de63e9620a3 /partitioning.py | |
| parent | 5d3e6e2507ea0a7455adcb146c9fddaf246d8dd5 (diff) | |
| download | anaconda-dcd40049034b8894ae9ccc12b0a3a5d4cdbc7574.tar.gz anaconda-dcd40049034b8894ae9ccc12b0a3a5d4cdbc7574.tar.xz anaconda-dcd40049034b8894ae9ccc12b0a3a5d4cdbc7574.zip | |
better fix for the swap on RAID thing
Diffstat (limited to 'partitioning.py')
| -rw-r--r-- | partitioning.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/partitioning.py b/partitioning.py index 205f1078b..fbdd50289 100644 --- a/partitioning.py +++ b/partitioning.py @@ -541,7 +541,11 @@ def sanityCheckRaidRequest(reqpartitions, newraid, doPartitionCheck = 1): # return the actual size being used by the request in megabytes def requestSize(req, diskset): if req.type == REQUEST_RAID: - thissize = req.size + # XXX duplicate the hack below. + if req.size != None: + thissize = req.size + else: + thissize = 0 else: part = get_partition_by_name(diskset.disks, req.device) if not part: @@ -590,7 +594,7 @@ def sanityCheckAllRequests(requests, diskset, baseChecks = 0): foundSwap = 0 swapSize = 0 for request in requests.requests: - if request.fstype and request.fstype.getName() == "swap" and not request.raidlevel: + if request.fstype and request.fstype.getName() == "swap": foundSwap = foundSwap + 1 swapSize = swapSize + requestSize(request, diskset) if baseChecks: |