summaryrefslogtreecommitdiffstats
path: root/partitions.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /partitions.py
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz
anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz
anaconda-459119c94529602d08de465b7ebfa4871d328081.zip
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is * clean up warnings, we build with -Wall -Werror here too * product.img stuff * max logical partitions enforcement * 1 TB max fs size * ethtool stuff * autopart in kickstart * driver disk fixes * RHEL upgrade stuff * network driver disks * variant pkgorder/tree splitting
Diffstat (limited to 'partitions.py')
-rw-r--r--partitions.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/partitions.py b/partitions.py
index 94f5c4ce9..a2cbb9b3d 100644
--- a/partitions.py
+++ b/partitions.py
@@ -641,7 +641,7 @@ class Partitions:
elif iutil.getPPCMachine() == "iSeries":
for req in self.requests:
if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"):
- return req
+ return [ req ]
return None
elif iutil.getPPCMachine() == "pSeries":
# pSeries bootable requests are odd.
@@ -823,10 +823,11 @@ class Partitions:
iutil.getPPCMachine() == "iSeries"):
reqs = self.getBootableRequest()
found = 0
- for req in reqs:
- if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"):
- found = 1
- break
+ if reqs:
+ for req in reqs:
+ if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"):
+ found = 1
+ break
if not found:
errors.append(_("You must create a PPC PReP Boot partition."))