|
|
|
@ -1645,10 +1645,18 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def setUsers(self,listUsers):
|
|
|
|
|
def setUsers(self,listUsers,autologinUser):
|
|
|
|
|
"""Set users data (migration)"""
|
|
|
|
|
if listUsers:
|
|
|
|
|
migrateUsers = list(set(listUsers))
|
|
|
|
|
if autologinUser == "none":
|
|
|
|
|
autologinUser = ""
|
|
|
|
|
if autologinUser or autologinUser == "":
|
|
|
|
|
self.clVars.Set('cl_autologin', autologinUser, force=True)
|
|
|
|
|
else:
|
|
|
|
|
autologinUser = self.clVars.Get('cl_autologin')
|
|
|
|
|
autologinUser = [autologinUser] if autologinUser else []
|
|
|
|
|
listUsers = listUsers or []
|
|
|
|
|
if listUsers or autologinUser:
|
|
|
|
|
migrateUsers = list(set(listUsers+autologinUser))
|
|
|
|
|
migrateUsers.sort()
|
|
|
|
|
migrateUsers = ["root"] + filter(lambda x: x!="root", migrateUsers)
|
|
|
|
|
self.clVars.Set('cl_migrate_user', migrateUsers, force=True)
|
|
|
|
@ -1713,10 +1721,10 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def setInstallOptions(self, listDisks, listBinds, listSwaps, listUsers,
|
|
|
|
|
brDisk):
|
|
|
|
|
autologinUser, brDisk):
|
|
|
|
|
"""Set install options (set users, disks and boot record"""
|
|
|
|
|
try:
|
|
|
|
|
if self.setUsers(listUsers) and \
|
|
|
|
|
if self.setUsers(listUsers,autologinUser) and \
|
|
|
|
|
self.setDisks(listDisks,listBinds,listSwaps) and \
|
|
|
|
|
self.setBR(brDisk):
|
|
|
|
|
return self.createListOptions()
|
|
|
|
@ -2224,13 +2232,19 @@ class cl_install(color_print, SignalInterrupt):
|
|
|
|
|
self.stdoutHide = None
|
|
|
|
|
self.stderrHide = None
|
|
|
|
|
|
|
|
|
|
def configureSystem(self):
|
|
|
|
|
def configureSystem(self,autologin):
|
|
|
|
|
"""configure current system"""
|
|
|
|
|
configureMessage = _("Configure system")
|
|
|
|
|
error = None
|
|
|
|
|
keyInter = None
|
|
|
|
|
try:
|
|
|
|
|
try:
|
|
|
|
|
if autologin:
|
|
|
|
|
objUsers = currentUsers()
|
|
|
|
|
if not objUsers.hasUsers(autologin):
|
|
|
|
|
self.printERROR(_("User %s is not exists")%autologin)
|
|
|
|
|
else:
|
|
|
|
|
self.setUsers([],autologin)
|
|
|
|
|
# install this package
|
|
|
|
|
self.installPackage()
|
|
|
|
|
self.printMessageForTest(configureMessage)
|
|
|
|
|