|
|
|
@ -551,7 +551,9 @@ class Install(MethodsInterface):
|
|
|
|
|
установка пароля пользователя root
|
|
|
|
|
"""
|
|
|
|
|
migrator = migrate(target.getDirectory())
|
|
|
|
|
if not migrator.migrate(migrate_data, root_pwd, [], [], ):
|
|
|
|
|
|
|
|
|
|
if not migrator.migrate([[x[0],x[2],x[3]] for x in migrate_data],
|
|
|
|
|
root_pwd, [], [], ):
|
|
|
|
|
raise InstallError(_("Failed to migrate users onto the new system"))
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
@ -577,11 +579,11 @@ class Install(MethodsInterface):
|
|
|
|
|
"""
|
|
|
|
|
Обновить список локальных администраторов при установке
|
|
|
|
|
"""
|
|
|
|
|
install_admin = Admins(dv, chroot=True)
|
|
|
|
|
install_admin = Admins(self.clVars, chroot=True)
|
|
|
|
|
install_admin.clear()
|
|
|
|
|
for k,v in dv.select('install.cl_migrate_user',
|
|
|
|
|
'install.cl_migrate_admin',
|
|
|
|
|
install_cl_migrate_admin__ne="none"):
|
|
|
|
|
for k,v in self.clVars.select('install.cl_migrate_user',
|
|
|
|
|
'install.cl_migrate_admin',
|
|
|
|
|
install_cl_migrate_admin__ne="none"):
|
|
|
|
|
install_admin[k] = v
|
|
|
|
|
install_admin.save()
|
|
|
|
|
return True
|
|
|
|
|