--- cdrom.image/sme8/updates/installclasses/smeinstallclass.py	2011/06/09 19:11:17	1.8
+++ cdrom.image/sme8/updates/installclasses/smeinstallclass.py	2011/06/11 23:00:46	1.9
@@ -184,6 +184,10 @@ class InstallClass(BaseInstallClass):
             else:
                 log.warning("Installing without using RAID")
 
+            fstype = "ext3"
+            if flags.cmdline.has_key("ext4"):
+                fstype = "ext4"
+
             (swapMin, swapMax) = iutil.swapSuggestion()
             if level >= 1:
                 raid1 = []
@@ -241,7 +245,7 @@ class InstallClass(BaseInstallClass):
                     partitions.autoPartitionRequests.append(partRequests.RaidRequestSpec(fileSystemTypeGet("swap"),
                             raidmembers=raid2, raidlevel="RAID"+str(level), raidminor=2, format=1, raidspares=spares))
 
-                    partitions.autoPartitionRequests.append(partRequests.RaidRequestSpec(fileSystemTypeGet("ext3"),
+                    partitions.autoPartitionRequests.append(partRequests.RaidRequestSpec(fileSystemTypeGet(fstype),
                             mountpoint="/", raidmembers=raid3, raidlevel="RAID"+str(level), raidminor=3, format=1,
                             raidspares=spares))
 
@@ -260,7 +264,7 @@ class InstallClass(BaseInstallClass):
                         request.uniqueID = 200
                         partitions.autoPartitionRequests.append(request)
                     else:
-                        partitions.autoPartitionRequests.append(partRequests.PartitionSpec(fileSystemTypeGet("ext3"),
+                        partitions.autoPartitionRequests.append(partRequests.PartitionSpec(fileSystemTypeGet(fstype),
                                 mountpoint="/", drive=[drive], size=1536, grow=1, primary=1, format=1))
 
                         partitions.autoPartitionRequests.append(partRequests.PartitionSpec(fileSystemTypeGet("swap"),
@@ -272,22 +276,22 @@ class InstallClass(BaseInstallClass):
                 partitions.autoPartitionRequests.append(request)
 
                 if not flags.cmdline.has_key("multipart"):
-                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
+                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet(fstype),
                             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))
                 else:
-                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
+                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet(fstype),
                             mountpoint="/", size=2048, maxSizeMB=4096, volgroup=201, lvname="root", grow=1, format=1))
 
-                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
+                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet(fstype),
                             mountpoint="/var", size=1024, maxSizeMB=4096, volgroup=201, lvname="var", grow=1, format=1))
 
-                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
+                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet(fstype),
                             mountpoint="/home/e-smith/files", size=1024, maxSizeMB=8192, volgroup=201, lvname="files", grow=1, format=1))
 
-                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("ext3"),
+                    partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet(fstype),
                             mountpoint="/tmp", size=1024, maxSizeMB=4096, volgroup=201, lvname="tmp", grow=1, format=1))
 
                     partitions.autoPartitionRequests.append(partRequests.LogicalVolumeRequestSpec(fileSystemTypeGet("swap"),