--- cdrom.image/sme7/product/installclasses/smeinstallclass.py 2009/06/07 02:30:05 1.2 +++ cdrom.image/sme7/product/installclasses/smeinstallclass.py 2009/06/08 14:43:06 1.3 @@ -13,7 +13,7 @@ import partedUtils class Script: def __repr__(self): - str = ("(s: '%s' i: %s c: %d)") % \ + str = ("(s: '%s' i: %s c: %d)") % \ (self.script, self.interp, self.inChroot) return string.replace(str, "\n", "|") @@ -61,9 +61,8 @@ class InstallClass(BaseInstallClass): "will be repartitioned and formated.") sortPriority = 1 - - cmdline = {} doPartition = False + cmdline = {} parentClass = ( _("Install SME Server"), "smeserver.png" ) @@ -133,7 +132,6 @@ class InstallClass(BaseInstallClass): "complete" ) - # 'partition' can be used on the command line to force # verification of partitions. useful in some cases... if self.doPartition or self.cmdline.has_key("partition"): @@ -244,13 +242,13 @@ class InstallClass(BaseInstallClass): raidmembers=raid2, raidlevel="RAID"+str(level), raidminor=2, format=1, raidspares=spares)) partitions.autoPartitionRequests.append(partRequests.RaidRequestSpec(fileSystemTypeGet("ext3"), - mountpoint="/", raidmembers=raid3, raidlevel="RAID"+str(level), raidminor=3, format=1, + mountpoint="/", raidmembers=raid3, raidlevel="RAID"+str(level), raidminor=3, format=1, raidspares=spares)) else: for drive in drives: partitions.autoPartitionRequests.append(partRequests.PartitionSpec(fileSystemTypeGet("ext3"), - mountpoint="/boot", drive=[drive], size=100, primary=1, format=1)) + mountpoint="/boot", drive=[drive], size=100, primary=1, format=1)) if not self.cmdline.has_key("nolvm"): request = partRequests.PartitionSpec(fileSystemTypeGet("physical volume (LVM)"),