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

[preservefiles] [users] Use the Permissions methods

Browse Source 
- don't call out to tools (executables) when we have an API for it
  (which might call out to those tools, but that's abstracted)
This commit is contained in:
Adriaan de Groot 2020-07-27 12:25:50 +02:00
parent 59dff815fc
commit 90a0605f38
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/modules/preservefiles/PreserveFiles.cpp
View File

@ -157,26 +157,9 @@ PreserveFiles::exec()
{
if ( it.perm.isValid() )
{
auto s_p = CalamaresUtils::System::instance();
int r;
r = s_p->targetEnvCall( QStringList { "chown", it.perm.username(), bare_dest } );
if ( r )
if ( !it.perm.apply( CalamaresUtils::System::instance()->targetPath( bare_dest ) ) )
{
cWarning() << "Could not chown target" << bare_dest;
}
r = s_p->targetEnvCall( QStringList { "chgrp", it.perm.group(), bare_dest } );
if ( r )
{
cWarning() << "Could not chgrp target" << bare_dest;
}
r = s_p->targetEnvCall( QStringList { "chmod", it.perm.octal(), bare_dest } );
if ( r )
{
cWarning() << "Could not chmod target" << bare_dest;
cWarning() << "Could not set attributes of" << bare_dest;
}
}

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

@ -12,6 +12,7 @@
#include "JobQueue.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h"
#include "utils/Permissions.h"
#include <QDateTime>
#include <QDir>
@ -103,7 +104,7 @@ CreateUserJob::exec()
if ( fileResult )
{
if ( QProcess::execute( "chmod", { "440", fileResult.path() } ) )
if ( CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) )
{
return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
}