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

[partition] Mount fs read-only when searching for fstab

Browse Source 
Submitted by aliveafter1000

FIXES: #1044
CLOSES: #1050
This commit is contained in:
Adriaan de Groot 2018-11-12 15:26:15 +01:00
parent 9459ef7d93
commit c522004575
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ lookForFstabEntries( const QString& partitionPath )
QTemporaryDir mountsDir; QTemporaryDir mountsDir;
mountsDir.setAutoRemove( false ); mountsDir.setAutoRemove( false );
int exit = QProcess::execute( "mount", { partitionPath, mountsDir.path() } ); int exit = QProcess::execute( "mount", { "-o", "ro,noload", partitionPath, mountsDir.path() } );
if ( !exit ) // if all is well if ( !exit ) // if all is well
{ {
QFile fstabFile( mountsDir.path() + "/etc/fstab" ); QFile fstabFile( mountsDir.path() + "/etc/fstab" );
@ -181,11 +181,7 @@ lookForFstabEntries( const QString& partitionPath )
} }
if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) ) if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) )
{
cWarning() << "Could not unmount" << mountsDir.path(); cWarning() << "Could not unmount" << mountsDir.path();
// There is stuff left in there, really don't remove
mountsDir.setAutoRemove( false );
}
} }
return fstabEntries; return fstabEntries;