|
|
|
@ -818,6 +818,12 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
|
return instnextres
|
|
|
|
|
return curnextres
|
|
|
|
|
|
|
|
|
|
def printAllPartitonsTable(self):
|
|
|
|
|
"""Print install report"""
|
|
|
|
|
title, headerList, dataList = self.generateTableAllPartitionData()
|
|
|
|
|
tableObj = tableReport("", headerList, dataList)
|
|
|
|
|
tableObj.printReport(False)
|
|
|
|
|
|
|
|
|
|
def printLocationTables(self):
|
|
|
|
|
"""Print install report"""
|
|
|
|
|
title, headerList, dataList = self.generateTableMountData()
|
|
|
|
@ -1759,6 +1765,29 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
|
if grubProcess.failed():
|
|
|
|
|
raise DistributiveError(_("Cann't install bootloader"))
|
|
|
|
|
|
|
|
|
|
def generateTableAllPartitionData(self):
|
|
|
|
|
"""Generate table for all partitions"""
|
|
|
|
|
def convertTypeToScheme(diskType):
|
|
|
|
|
res = ""
|
|
|
|
|
typeDict = {'loop':_("Loop"),
|
|
|
|
|
'raid':_("RAID"),
|
|
|
|
|
'lvm':_("LVM"),
|
|
|
|
|
'partition':_("Partition"),
|
|
|
|
|
'disk':_("Disk")}
|
|
|
|
|
for i in diskType.split('-'):
|
|
|
|
|
res = "%s on %s"%(typeDict.get(i,_('None')),res) if res else \
|
|
|
|
|
typeDict.get(i,_('None'))
|
|
|
|
|
return res
|
|
|
|
|
title = _("Available partitions")
|
|
|
|
|
headerList = [_("Size"),_("Device"),_("Label"),_("Directory"),
|
|
|
|
|
_("File system"), _("Scheme")]
|
|
|
|
|
return title, headerList, zip(self.clVars.Get('os_disk_size'),
|
|
|
|
|
self.clVars.Get('os_disk_dev'),
|
|
|
|
|
self.clVars.Get('os_disk_name'),
|
|
|
|
|
self.clVars.Get('os_disk_mount'),
|
|
|
|
|
self.clVars.Get('os_disk_format'),
|
|
|
|
|
map(convertTypeToScheme,self.clVars.Get('os_disk_type')))
|
|
|
|
|
|
|
|
|
|
def generateTableMountData(self):
|
|
|
|
|
"""Get data from print table"""
|
|
|
|
|
title = _("Location")
|
|
|
|
|