napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Improve explanation of other steps of adding a user

Browse Source
This commit is contained in:
Adriaan de Groot 2018-05-23 08:11:49 -04:00
parent 745dc9ad00
commit dae84d3bb1
1 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/modules/users/CreateUserJob.cpp
View File

@ -161,29 +161,23 @@ CreateUserJob::exec()
return pres.explainProcess( useradd, 10 /* bogus timeout */ ); return pres.explainProcess( useradd, 10 /* bogus timeout */ );
} }
int ec = CalamaresUtils::System::instance()-> pres = CalamaresUtils::System::instance()->targetEnvCommand(
targetEnvCall( { "usermod", { "usermod", "-aG", defaultGroups, m_userName } );
"-aG", if ( pres.getExitCode() )
defaultGroups, {
m_userName } ); cError() << "usermod failed" << pres.getExitCode();
if ( ec ) return pres.explainProcess( "usermod", 10 );
return Calamares::JobResult::error( tr( "Cannot add user %1 to groups: %2." ) }
.arg( m_userName )
.arg( defaultGroups ),
tr( "usermod terminated with error code %1." )
.arg( ec ) );
ec = CalamaresUtils::System::instance()-> QString userGroup = QString( "%1:%2" ).arg( m_userName ).arg( m_userName );
targetEnvCall( { "chown", QString homeDir = QString( "/home/%1" ).arg( m_userName );
"-R", pres = CalamaresUtils::System::instance()->targetEnvCommand(
QString( "%1:%2" ).arg( m_userName ) { "chown", "-R", userGroup, homeDir } );
.arg( m_userName ), if ( pres.getExitCode() )
QString( "/home/%1" ).arg( m_userName ) } ); {
if ( ec ) cError() << "chown failed" << pres.getExitCode();
return Calamares::JobResult::error( tr( "Cannot set home directory ownership for user %1." ) return pres.explainProcess( "chown", 10 );
.arg( m_userName ), }
tr( "chown terminated with error code %1." )
.arg( ec ) );
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }