From edf3cbefc341fb7c4447ae2c00f577c3201e297c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= <mh@calculate.ru>
Date: Fri, 23 Jun 2017 15:19:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/install/install.py          | 12 +++++++-----
 pym/install/utils/cl_install.py |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pym/install/install.py b/pym/install/install.py
index 55508b9..88b6d47 100644
--- a/pym/install/install.py
+++ b/pym/install/install.py
@@ -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
diff --git a/pym/install/utils/cl_install.py b/pym/install/utils/cl_install.py
index 649b49a..7ff949c 100644
--- a/pym/install/utils/cl_install.py
+++ b/pym/install/utils/cl_install.py
@@ -116,7 +116,7 @@ class ClInstallAction(Action):
                    'cl_migrate_root_pwd)',
          },
         # прописывание локальных администраторов
-        {'name': 'hdd:user_migrate',
+        {'name': 'hdd:write_admins',
          'method': 'Install.update_admin_ini()',
          },
         # подготовка загрузчика