Merge pull request #802 from abucodonosor/pr-autologin2

CreateUserJob: do not force any autologin group
9 years ago · 8b61b3ddc3
parent c9f4bc0cc8 5d241f8e09
commit 8b61b3ddc3
1 changed files with 5 additions and 6 deletions
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@ -115,13 +115,12 @@ CreateUserJob::exec()
    {
        QString autologinGroup;
        if ( gs->contains( "autologinGroup" ) &&
-             !gs->value( "autologinGroup" ).toString().isEmpty() )
+                !gs->value( "autologinGroup" ).toString().isEmpty() )
+        {
            autologinGroup = gs->value( "autologinGroup" ).toString();
-        else
-            autologinGroup = QStringLiteral( "autologin" );
-
-        CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } );
-        defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) );
+            CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", autologinGroup } );
+            defaultGroups.append( QString( ",%1" ).arg( autologinGroup ) );
+        }
    }

    // If we're looking to reuse the contents of an existing /home