--- autopart.py~	2005-02-18 16:53:50.000000000 +0000
+++ autopart.py	2005-02-18 19:57:56.000000000 +0000
@@ -303,6 +303,8 @@
             # FIXME: this is a hack to make sure prep boot is even more first
             if request.fstype == fsset.fileSystemTypeGet("PPC PReP Boot"):
                 numDrives = -1
+            if request.fstype == fsset.fileSystemTypeGet("Apple Bootstrap"):
+                numDrives = -1
         else:
             drives = getDriveList(request, diskset)
             numDrives = len(drives)
@@ -1487,7 +1489,7 @@
     """
     
     requests = []
-    for (mntpt, fstype, minsize, maxsize, grow, format) in autoreq:
+    for (mntpt, fstype, minsize, maxsize, grow, format, asvol) in autoreq:
         if fstype:
             ptype = fsset.fileSystemTypeGet(fstype)
         else:
@@ -1575,9 +1577,8 @@
         return [ (None, "PPC PReP Boot", 16, None, 0, 1, 0) ]
     elif (iutil.getPPCMachine() == "iSeries") and iutil.hasiSeriesNativeStorage():
         return []
-    elif (iutil.getPPCMachine() == "PMac") and iutil.getPPCMacGen == "NewWorld":
-        return [ ( None, "Apple Bootstrap", 1, 1, 0, 1, 0) , 
-                 ("/boot", None, 100, None, 0, 1, 0) ]
+    elif (iutil.getPPCMachine() == "PMac") and iutil.getPPCMacGen() == "NewWorld":
+        return [ ( None, "Apple Bootstrap", 1, 1, 0, 1, 0) ]
     else:
         return [ ("/boot", None, 100, None, 0, 1, 0) ]
 
--- installclass.py~	2005-02-09 17:03:58.000000000 +0000
+++ installclass.py	2005-02-18 20:03:45.000000000 +0000
@@ -551,7 +551,12 @@
         if doClear:
             partitions.autoClearPartType = clear
             partitions.autoClearPartDrives = []
-        partitions.autoPartitionRequests = autoCreateLVMPartitionRequests(autorequests)
+
+        if (iutil.getPPCMachine() == "PMac"):
+            # No LVM on a Mac partition table
+            partitions.autoPartitionRequests = autoCreatePartitionRequests(autorequests)
+        else:
+            partitions.autoPartitionRequests = autoCreateLVMPartitionRequests(autorequests)
         
 
     def setInstallData(self, id, intf = None):
--- partitions.py~	2005-01-21 18:31:39.000000000 +0000
+++ partitions.py	2005-02-18 20:05:54.000000000 +0000
@@ -616,6 +616,11 @@
                 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"):