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

[users] Pass the home permissions to useradd

Browse Source
This commit is contained in:
Adriaan de Groot 2024-09-11 18:00:37 +02:00
parent aa938285a4
commit 8c8bb7a3df
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ CreateUserJob::prettyStatusMessage() const
} }
static Calamares::JobResult static Calamares::JobResult
createUser( const QString& loginName, const QString& fullName, const QString& shell ) createUser( const QString& loginName, const QString& fullName, const QString& shell, int umask )
{ {
QStringList useraddCommand; QStringList useraddCommand;
#ifdef __FreeBSD__ #ifdef __FreeBSD__
@ -67,6 +67,10 @@ createUser( const QString& loginName, const QString& fullName, const QString& sh
useraddCommand << "-s" << shell; useraddCommand << "-s" << shell;
} }
useraddCommand << "-c" << fullName; useraddCommand << "-c" << fullName;
if ( umask >= 0 )
{
useraddCommand << "-K" << ( QStringLiteral( "UMASK=" ) + QString::number( umask, 8 ) );
}
useraddCommand << loginName; useraddCommand << loginName;
#endif #endif
@ -136,7 +140,8 @@ CreateUserJob::exec()
m_status = tr( "Creating user %1…", "@status" ).arg( m_config->loginName() ); m_status = tr( "Creating user %1…", "@status" ).arg( m_config->loginName() );
emit progress( 0.5 ); emit progress( 0.5 );
auto useraddResult = createUser( m_config->loginName(), m_config->fullName(), m_config->userShell() ); auto useraddResult
= createUser( m_config->loginName(), m_config->fullName(), m_config->userShell(), m_config->homeUMask() );
if ( !useraddResult ) if ( !useraddResult )
{ {
return useraddResult; return useraddResult;