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

Merge pull request #802 from abucodonosor/pr-autologin2

Browse Source 
CreateUserJob: do not force any autologin group
This commit is contained in:
Adriaan de Groot 2017-09-14 03:28:34 -04:00 committed by GitHub
commit 8b61b3ddc3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,13 +116,12 @@ CreateUserJob::exec()
QString autologinGroup; QString autologinGroup;
if ( gs->contains( "autologinGroup" ) && if ( gs->contains( "autologinGroup" ) &&
!gs->value( "autologinGroup" ).toString().isEmpty() ) !gs->value( "autologinGroup" ).toString().isEmpty() )
{
autologinGroup = gs->value( "autologinGroup" ).toString(); autologinGroup = gs->value( "autologinGroup" ).toString();
else
autologinGroup = QStringLiteral( "autologin" );
CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } ); CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } );
defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) ); defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) );
} }
}
// If we're looking to reuse the contents of an existing /home // If we're looking to reuse the contents of an existing /home
if ( gs->value( "reuseHome" ).toBool() ) if ( gs->value( "reuseHome" ).toBool() )