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

[partition] Use TemporaryMount support class

Browse Source 
- While here, fix up compile warning
 - add -R to umount for good measure
This commit is contained in:
Adriaan de Groot 2019-06-20 14:49:44 +02:00
parent dd0adeb3bb
commit ba7259d9ee
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamares/partition/Mount.cpp
View File

@ -96,7 +96,7 @@ TemporaryMount::~TemporaryMount()
{ {
if ( m_valid ) if ( m_valid )
{ {
unmount( m_devicePath ); unmount( m_devicePath, { "-R" } );
} }
} }

2
src/libcalamares/partition/Mount.h
View File

@ -54,7 +54,7 @@ DLLEXPORT int mount( const QString& devicePath,
*/ */
DLLEXPORT int unmount( const QString& path, const QStringList& options = QStringList() ); DLLEXPORT int unmount( const QString& path, const QStringList& options = QStringList() );
DLLEXPORT class TemporaryMount class DLLEXPORT TemporaryMount
{ {
public: public:
TemporaryMount( const QString& devicePath, TemporaryMount( const QString& devicePath,

8
src/modules/partition/core/PartUtils.cpp
View File

@ -28,6 +28,7 @@
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "partition/Mount.h"
#include "partition/PartitionIterator.h" #include "partition/PartitionIterator.h"
#include "partition/PartitionQuery.h" #include "partition/PartitionQuery.h"
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
@ -248,8 +249,8 @@ lookForFstabEntries( const QString& partitionPath )
QTemporaryDir mountsDir; QTemporaryDir mountsDir;
mountsDir.setAutoRemove( false ); mountsDir.setAutoRemove( false );
int exit = QProcess::execute( "mount", { "-o", mountOptions.join(','), partitionPath, mountsDir.path() } ); CalamaresUtils::Partition::TemporaryMount mount( partitionPath, mountsDir.path(), QString(), mountOptions.join(',') );
if ( !exit ) // if all is well if ( mount.isValid() )
{ {
QFile fstabFile( mountsDir.path() + "/etc/fstab" ); QFile fstabFile( mountsDir.path() + "/etc/fstab" );
@ -269,9 +270,6 @@ lookForFstabEntries( const QString& partitionPath )
} }
else else
cWarning() << "Could not read fstab from mounted fs"; cWarning() << "Could not read fstab from mounted fs";
if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) )
cWarning() << "Could not unmount" << mountsDir.path();
} }
else else
cWarning() << "Could not mount existing fs"; cWarning() << "Could not mount existing fs";