--- cdrom.image/sme8/updates/installclasses/smeinstallclass.py	2009/06/10 14:22:18	1.4
+++ cdrom.image/sme8/updates/installclasses/smeinstallclass.py	2009/11/30 23:46:26	1.5
@@ -208,9 +208,14 @@ class InstallClass(BaseInstallClass):
                     partitions.autoPartitionRequests.append(request)
 
                     if not flags.cmdline.has_key("nolvm"):
-                        request = partRequests.PartitionSpec(fileSystemTypeGet("software RAID"),
-                                size=(swapMin+4096)/(len(drives)-spares-max(0,level-4)),
-                                drive=[drive], primary=1, grow=1, format=1)
+                        if not flags.cmdline.has_key("multipart"):
+                            request = partRequests.PartitionSpec(fileSystemTypeGet("software RAID"),
+                                    size=(swapMin+1536)/(len(drives)-spares-max(0,level-4)),
+                                    drive=[drive], primary=1, grow=1, format=1)
+                        else:
+                            request = partRequests.PartitionSpec(fileSystemTypeGet("software RAID"),
+                                    size=(swapMin+5120)/(len(drives)-spares-max(0,level-4)),
+                                    drive=[drive], primary=1, grow=1, format=1)
                         request.uniqueID = uniqueID + 50
                         raid2.append(uniqueID + 50)
                         partitions.autoPartitionRequests.append(request)
@@ -223,7 +228,7 @@ class InstallClass(BaseInstallClass):
                         partitions.autoPartitionRequests.append(request)
 
                         request = partRequests.PartitionSpec(fileSystemTypeGet("software RAID"),
-                                size=1500/(len(drives)-spares-max(0,level-4)),
+                                size=1536/(len(drives)-spares-max(0,level-4)),
                                 drive=[drive], grow=1, primary=1, format=1)
                         request.uniqueID = uniqueID + 60
                         raid3.append(uniqueID + 60)
@@ -255,13 +260,17 @@ class InstallClass(BaseInstallClass):
                             mountpoint="/boot", drive=[drive], size=100, primary=1, format=1))
 
                     if not flags.cmdline.has_key("nolvm"):
-                        request = partRequests.PartitionSpec(fileSystemTypeGet("physical volume (LVM)"),
-                                drive=[drive], size=swapMin+4096, grow=1, primary=1, format=1)
+                        if not flags.cmdline.has_key("multipart"):
+                            request = partRequests.PartitionSpec(fileSystemTypeGet("physical volume (LVM)"),
+                                    drive=[drive], size=swapMin+1536, grow=1, primary=1, format=1)
+                        else:
+                            request = partRequests.PartitionSpec(fileSystemTypeGet("physical volume (LVM)"),
+                                    drive=[drive], size=swapMin+5120, grow=1, primary=1, format=1)
                         request.uniqueID = 200
                         partitions.autoPartitionRequests.append(request)
                     else:
                         partitions.autoPartitionRequests.append(partRequests.PartitionSpec(fileSystemTypeGet("ext3"),
-                                mountpoint="/", drive=[drive], size=4096, grow=1, primary=1, format=1))
+                                mountpoint="/", drive=[drive], size=1536, grow=1, primary=1, format=1))
 
                         partitions.autoPartitionRequests.append(partRequests.PartitionSpec(fileSystemTypeGet("swap"),
                                 drive=[drive], size=swapMin, maxSizeMB=swapMax, grow=1, primary=1, format=1))
@@ -273,7 +282,7 @@ class InstallClass(BaseInstallClass):
 
                 if not flags.cmdline.has_key("multipart"):
                     partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
-                            mountpoint="/", size=1300, volgroup=201, lvname="root", grow=1, format=1))
+                            mountpoint="/", size=1536, volgroup=201, lvname="root", grow=1, format=1))
 
                     partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("swap"),
                             size=swapMin, maxSizeMB=swapMax, volgroup=201, lvname="swap", grow=1, format=1))
@@ -288,7 +297,7 @@ class InstallClass(BaseInstallClass):
                             mountpoint="/home/e-smith/files", size=1024, maxSizeMB=8192, volgroup=201, lvname="files", grow=1, format=1))
 
                     partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
-                            mountpoint="/tmp", size=512, maxSizeMB=4096, volgroup=201, lvname="tmp", grow=1, format=1))
+                            mountpoint="/tmp", size=1024, maxSizeMB=4096, volgroup=201, lvname="tmp", grow=1, format=1))
 
                     partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("swap"),
                             size=swapMin, maxSizeMB=swapMax, volgroup=201, lvname="swap", grow=1, format=1))