--- cdrom.image/sme9/product/installclasses/server.py 2014/03/18 14:54:09 1.9 +++ cdrom.image/sme9/product/installclasses/server.py 2014/03/24 01:45:52 1.10 @@ -142,7 +142,12 @@ class InstallClass(BaseInstallClass): # If user specifies "noraid", then useRAID = False; otherwise, useRAID = True # If useRAID = False below, then RAID1 won't be used - useRAID_flag = not flags.cmdline.has_key("noraid") + if flags.cmdline.has_key("noraid"): + raidLevel = "none" + else: + raidLevel = "1" + if flags.cmdline.has_key("raid") and flags.cmdline["raid"] in ["none","0","1","5","6"]: + raidLevel = flags.cmdline["raid"] fstype = "ext4" if flags.cmdline.has_key("ext3"): @@ -152,20 +157,20 @@ class InstallClass(BaseInstallClass): # Manually specify fstype = ext3/ext4 and size = 250 MB # (Platform default is fstype ext4 and size = 500 MB) - autorequests.append(PartSpec(mountpoint="/boot", fstype=fstype, size=250, useRAID=useRAID_flag, + autorequests.append(PartSpec(mountpoint="/boot", fstype=fstype, size=250, raidLevel=raidLevel, weight=platform.weight(mountpoint="/boot"))) # / # Manually specify fstype = ext3/ext4 and size = 2048 MB, but growable - autorequests.append(PartSpec(mountpoint="/", fstype=fstype, size=2048, useRAID=useRAID_flag, + autorequests.append(PartSpec(mountpoint="/", fstype=fstype, size=2048, raidLevel=raidLevel, grow=True, asVol=asVol_flag)) # swap # Manually specify fstype = swap and minswap < size < maxswap (growable) (minswap, maxswap) = iutil.swapSuggestion() - autorequests.append(PartSpec(fstype="swap", size=minswap, maxSize=maxswap, useRAID=useRAID_flag, + autorequests.append(PartSpec(fstype="swap", size=minswap, maxSize=maxswap, raidLevel=raidLevel, grow=True, asVol=asVol_flag)) storage.autoPartitionRequests = autorequests