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

Merge branch 'i895-setroot-context'

Browse Source 
FIXES #895
This commit is contained in:
Adriaan de Groot 2018-01-29 22:12:23 +01:00
commit 9a7e766391
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/users/UsersPage.cpp
View File

@ -130,6 +130,8 @@ UsersPage::createJobs( const QStringList& defaultGroupsList )
if ( !isReady() )
return list;
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
Calamares::Job* j;
j = new CreateUserJob( ui->textBoxUsername->text(),
ui->textBoxFullName->text().isEmpty() ?
@ -145,6 +147,7 @@ UsersPage::createJobs( const QStringList& defaultGroupsList )
if ( m_writeRootPassword )
{
gs->insert( "reuseRootPassword", ui->checkBoxReusePassword->isChecked() );
if ( ui->checkBoxReusePassword->isChecked() )
j = new SetPasswordJob( "root",
ui->textBoxUserPassword->text() );
@ -163,7 +166,6 @@ UsersPage::createJobs( const QStringList& defaultGroupsList )
j = new SetHostNameJob( ui->textBoxHostname->text() );
list.append( Calamares::job_ptr( j ) );
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
gs->insert( "hostname", ui->textBoxHostname->text() );
if ( ui->checkBoxAutoLogin->isChecked() )
gs->insert( "autologinUser", ui->textBoxUsername->text() );