applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Move TemporaryDir into TemporaryMount

Browse source 
- Only one user of TemporaryMount, and we should distinguish
   "regular" temp mounts from temp mounts with a hand-picked
   mount point.
This commit is contained in:
Adriaan de Groot 2019-06-21 16:30:09 +02:00
parent 08537823ae
commit d3df346ce7
3 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,13 +246,11 @@ lookForFstabEntries( const QString& partitionPath )
<< "for fstab (fs=" << r.getOutput() << ')';
FstabEntryList fstabEntries;
QTemporaryDir mountsDir;
mountsDir.setAutoRemove( false );
CalamaresUtils::Partition::TemporaryMount mount( partitionPath, mountsDir.path(), QString(), mountOptions.join(',') );
CalamaresUtils::Partition::TemporaryMount mount( partitionPath, QString(), mountOptions.join(',') );
if ( mount.isValid() )
{
QFile fstabFile( mountsDir.path() + "/etc/fstab" );
QFile fstabFile( mount.path() + "/etc/fstab" );
cDebug() << Logger::SubEntry << "reading" << fstabFile.fileName();