From 1d6dca062c6e89d805a85e0f71106455c47d6649 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 24 Jan 2018 16:18:30 +0100
Subject: [PATCH] [users] Make state of 'reuse password for root' available in
 globals.

---
 src/modules/users/UsersPage.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index 8ea961662..a821c6e88 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -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() );