diff --git a/data/calculate b/data/calculate index 8bc3354..c7f60b9 100644 --- a/data/calculate +++ b/data/calculate @@ -108,18 +108,10 @@ create_nonroot_user() { fi } -# create/update all user profile +# create/update root profile configure_users() { if which cl-desktop &>/dev/null then - for user in $(variable_value install.cl_migrate_user | sed -r "s/,/ /g") - do - HOME_DIR=`getent passwd $user | awk -F: '{ print( $6 ); }'` - if [[ -f $HOME_DIR/.calculate/ini.env ]] - then - cl-desktop $user - fi - done cl-desktop root fi } diff --git a/install/cl_wsdl_install.py b/install/cl_wsdl_install.py index 68eb984..4f74188 100644 --- a/install/cl_wsdl_install.py +++ b/install/cl_wsdl_install.py @@ -62,6 +62,7 @@ class InstallInfo(CommonInfo): cl_migrate_root_pwd = String cl_migrate_data = Array(Array(String)) + cl_install_home_crypt_set = Boolean cl_autologin = String os_install_net_fqdn = String os_install_net_data = Array(Array(String)) @@ -140,6 +141,7 @@ class Wsdl: 'os_install_net_route_data',)) dv.addGroup(_("Users"), normal=('cl_migrate_root_pwd','cl_migrate_data','cl_autologin'), + expert=('cl_install_home_crypt_set',), hide=('cl_migrate_data',), brief=('cl_migrate_user',)) dv.addGroup(_("Audio"), diff --git a/install/datavars.py b/install/datavars.py index 9beb5e8..81a6510 100644 --- a/install/datavars.py +++ b/install/datavars.py @@ -15,7 +15,7 @@ # limitations under the License. __app__ = 'calculate-install' -__version__ = '3.0.2' +__version__ = '3.1.6' import os import sys diff --git a/install/variables/system.py b/install/variables/system.py index 3b70237..b257227 100644 --- a/install/variables/system.py +++ b/install/variables/system.py @@ -164,6 +164,15 @@ class VariableClMigrateRootPwd(UserHelper,Variable): if not value: raise PasswordError(_("Password for user %s missing")%"root") +class VariableClInstallHomeCryptSet(UserHelper,Variable): + type = 'bool' + opt = ["--crypt-home","-C"] + untrusted = True + + def init(self): + self.help = _("crypt user profiles") + self.label = _("Crypt user profiles") + class VariableClMigrateData(UserHelper,TableVariable): """ User migrate data table diff --git a/setup.py b/setup.py index d99772d..7f57ce4 100755 --- a/setup.py +++ b/setup.py @@ -169,7 +169,7 @@ class build( distutils.command.build.build ) : setup( name = 'calculate-install', - version = "3.1.5", + version = "3.1.6", description = "Calculate Linux installer", author = "Calculate Ltd.", author_email = "support@calculate.ru",