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

[users] Refactor writing sudoers file

Browse Source 
- use existing convenience methods
This commit is contained in:
Adriaan de Groot 2020-06-22 17:10:03 +02:00
parent bc484ae5da
commit 409ab6ee86
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,26 +95,23 @@ CreateUserJob::exec()
{ {
cDebug() << "[CREATEUSER]: preparing sudoers"; cDebug() << "[CREATEUSER]: preparing sudoers";
QFileInfo sudoersFi( destDir.absoluteFilePath( "etc/sudoers.d/10-installer" ) ); QString sudoersLine = QString( "%%1 ALL=(ALL) ALL\n" ).arg( gs->value( "sudoersGroup" ).toString() );
auto fileResult
= CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ),
sudoersLine.toUtf8().constData(),
CalamaresUtils::System::WriteMode::Overwrite );
if ( !sudoersFi.absoluteDir().exists() ) if ( fileResult )
{ {
return Calamares::JobResult::error( tr( "Sudoers dir is not writable." ) ); if ( QProcess::execute( "chmod", { "440", fileResult.path() } ) )
{
return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
} }
}
QFile sudoersFile( sudoersFi.absoluteFilePath() ); else
if ( !sudoersFile.open( QIODevice::WriteOnly | QIODevice::Text ) )
{ {
return Calamares::JobResult::error( tr( "Cannot create sudoers file for writing." ) ); return Calamares::JobResult::error( tr( "Cannot create sudoers file for writing." ) );
} }
QString sudoersGroup = gs->value( "sudoersGroup" ).toString();
QTextStream sudoersOut( &sudoersFile );
sudoersOut << QString( "%%1 ALL=(ALL) ALL\n" ).arg( sudoersGroup );
if ( QProcess::execute( "chmod", { "440", sudoersFi.absoluteFilePath() } ) )
return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
} }
cDebug() << "[CREATEUSER]: preparing groups"; cDebug() << "[CREATEUSER]: preparing groups";