diff options
author | Paul Nasrat <pnasrat@redhat.com> | 2005-02-21 17:46:45 +0000 |
---|---|---|
committer | Paul Nasrat <pnasrat@redhat.com> | 2005-02-21 17:46:45 +0000 |
commit | a272ab8a3ad7b30189fcfbeafa2cab0ec38b779d (patch) | |
tree | c24b38d324f571615f5bc0dcb3ac4dd743c652eb /partitions.py | |
parent | b3790e80584cf9202b830f31e7c591d30ef75191 (diff) | |
download | anaconda-a272ab8a3ad7b30189fcfbeafa2cab0ec38b779d.tar.gz anaconda-a272ab8a3ad7b30189fcfbeafa2cab0ec38b779d.tar.xz anaconda-a272ab8a3ad7b30189fcfbeafa2cab0ec38b779d.zip |
Deal with multiple Apple Bootstrap partitions (dwmw2)
Diffstat (limited to 'partitions.py')
-rw-r--r-- | partitions.py | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/partitions.py b/partitions.py index 1f0a7576d..b11bb8e82 100644 --- a/partitions.py +++ b/partitions.py @@ -616,26 +616,27 @@ class Partitions: return [ bootreq ] else: return None - elif iutil.getPPCMachine() == "PMac": - for req in self.requests: - if req.fstype == fsset.fileSystemTypeGet("Apple Bootstrap"): - return [ req ] - return None elif iutil.getPPCMachine() == "iSeries": for req in self.requests: if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"): return [ req ] return None - elif iutil.getPPCMachine() == "pSeries": - # pSeries bootable requests are odd. - # have to consider both the PReP partition (with potentially > 1 - # existing) as well as /boot,/ - + elif (iutil.getPPCMachine() == "pSeries" or + iutil.getPPCMachine() == "PMac"): + # pSeries and Mac bootable requests are odd. + # have to consider both the PReP or Bootstrap partition (with + # potentially > 1 existing) as well as /boot,/ + + if iutil.getPPCMachine() == "pSeries": + boottype = "PPC PReP Boot" + else + boottype = "Apple Bootstrap" + # for the prep partition, we want either the first or the # first non-preexisting one bestprep = None for req in self.requests: - if req.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"): + if req.fstype == fsset.fileSystemTypeGet(boottype): if ((bestprep is None) or (bestprep.getPreExisting() and not req.getPreExisting())): |