|
|
@ -1534,13 +1534,6 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
self.printERROR(_("Cann't found disk '%s'")%mbrDisk)
|
|
|
|
self.printERROR(_("Cann't found disk '%s'")%mbrDisk)
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
mbr = self.clVars.Get('os_install_mbr')
|
|
|
|
|
|
|
|
tableOnBootDisk = self.varSelect('os_device_table',
|
|
|
|
|
|
|
|
where="os_device_dev",eq='mbr')
|
|
|
|
|
|
|
|
if not tableOnBootDisk:
|
|
|
|
|
|
|
|
self.printERROR(_("Disk '%s' without partition table cann't "
|
|
|
|
|
|
|
|
"contains boot record")%mbr)
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def createListOptions(self):
|
|
|
|
def createListOptions(self):
|
|
|
@ -2192,6 +2185,17 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
raise InstallError(_("Can not migrate users to new system"))
|
|
|
|
raise InstallError(_("Can not migrate users to new system"))
|
|
|
|
self.printByResult(True)
|
|
|
|
self.printByResult(True)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def checkCorrectBootRecordDisk(self):
|
|
|
|
|
|
|
|
"""Check boot record disk"""
|
|
|
|
|
|
|
|
mbr = self.clVars.Get('os_install_mbr')
|
|
|
|
|
|
|
|
tableOnBootDisk = self.varSelect('os_device_table',
|
|
|
|
|
|
|
|
where="os_device_dev",eq=mbr)
|
|
|
|
|
|
|
|
if not tableOnBootDisk:
|
|
|
|
|
|
|
|
self.printERROR(_("Disk '%s' without partition table cann't "
|
|
|
|
|
|
|
|
"contains boot record")%mbr)
|
|
|
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
def installSystem(self, force=False, bootDisk=None, stdinReadPwd=False,
|
|
|
|
def installSystem(self, force=False, bootDisk=None, stdinReadPwd=False,
|
|
|
|
builder=False, flagSpinner=True, update=False):
|
|
|
|
builder=False, flagSpinner=True, update=False):
|
|
|
|
"""install System by current variable enviroment"""
|
|
|
|
"""install System by current variable enviroment"""
|
|
|
@ -2199,6 +2203,8 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
targetDistr = None
|
|
|
|
targetDistr = None
|
|
|
|
error = None
|
|
|
|
error = None
|
|
|
|
distrCopy = False
|
|
|
|
distrCopy = False
|
|
|
|
|
|
|
|
if not self.checkCorrectBootRecordDisk():
|
|
|
|
|
|
|
|
return False
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
rootPartdev = self.clVars.Get('os_install_root_dev')
|
|
|
|
rootPartdev = self.clVars.Get('os_install_root_dev')
|
|
|
|
rootPartCmdList = filter(lambda x: x['dev']==rootPartdev,
|
|
|
|
rootPartCmdList = filter(lambda x: x['dev']==rootPartdev,
|
|
|
|