/[smeserver]/cdrom.image/sme7/product/installclasses/smeinstallclass.py
ViewVC logotype

Diff of /cdrom.image/sme7/product/installclasses/smeinstallclass.py

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.3 by slords, Mon Jun 8 14:43:06 2009 UTC Revision 1.4 by slords, Wed Jun 10 14:22:18 2009 UTC
# Line 143  class InstallClass(BaseInstallClass): Line 143  class InstallClass(BaseInstallClass):
143          self.cmdline = self.createCmdlineDict()          self.cmdline = self.createCmdlineDict()
144          diskset = partedUtils.DiskSet()          diskset = partedUtils.DiskSet()
145    
146          alldrives = diskset.driveList()          if self.cmdline.has_key("exclude"):
147                alldrives = filter(lambda x:not x in self.cmdline["exclude"].split(","), diskset.driveList())
148            else:
149                alldrives = diskset.driveList()
150    
151          if self.cmdline.has_key("drives"):          if self.cmdline.has_key("drives"):
152              drives = filter(lambda x:self.mediaPresent(x) and              if self.cmdline["drives"] == "all":
153                                       x in self.cmdline["drives"].split(","), alldrives)                  drives = filter(lambda x:self.mediaPresent(x), alldrives)
154                else:
155                    drives = filter(lambda x:self.mediaPresent(x) and
156                                             x in self.cmdline["drives"].split(","), alldrives)
157          else:          else:
158              drives = filter(lambda x:not isys.driveIsRemovable(x) and              drives = filter(lambda x:not isys.driveIsRemovable(x) and
159                                       self.mediaPresent(x) and                                       self.mediaPresent(x) and
160                                       not isys.driveUsesModule(x, ["usb-storage", "ub", "sbp2"]), alldrives)                                       not isys.driveUsesModule(x, ["usb-storage", "ub", "sbp2"]), alldrives)
161    
162          if self.cmdline.has_key("spares"):          if self.cmdline.has_key("spares"):
163              spares = max(0,min(int(self.cmdline["spares"]),len(drives)-2))              if self.cmdline["spares"] == "none":
164                    spares = 0
165                else:
166                    try:
167                        spares = max(0,min(int(self.cmdline["spares"]),len(drives)-2))
168                    except:
169                        spares = (len(drives)+4)/7
170          else:          else:
171              spares = (len(drives)+4)/7              spares = (len(drives)+4)/7
172    
# Line 182  class InstallClass(BaseInstallClass): Line 195  class InstallClass(BaseInstallClass):
195                  level = 1                  level = 1
196    
197          if len(drives) >= 1:          if len(drives) >= 1:
198                excluded = filter(lambda x:x not in drives, diskset.driveList())
199              log("Using the following drives: %s" % drives)              log("Using the following drives: %s" % drives)
200                log("Excluding the following drives: %s" % excluded)
201              if level >= 1:              if level >= 1:
202                  log("Installing using RAID%s" % level)                  log("Installing using RAID%s" % level)
203                  log("Using %s spare drives" % spares)                  log("Using %s spare drives" % spares)

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed