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

[partition] Construct, then winnow, the fstab entries

Browse Source
This commit is contained in:
Adriaan de Groot 2018-11-02 12:13:29 -04:00
parent ebbc1a1bcb
commit 6de55e6951
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,25 +175,9 @@ lookForFstabEntries( const QString& partitionPath )
.split( '\n' ); .split( '\n' );
for ( const QString& rawLine : fstabLines ) for ( const QString& rawLine : fstabLines )
{ fstabEntries.append( FstabEntry::fromEtcFstab( rawLine ) );
QString line = rawLine.simplified();
if ( line.startsWith( '#' ) )
continue;
QStringList splitLine = line.split( ' ' );
if ( splitLine.length() != 6 )
continue;
fstabEntries.append( { splitLine.at( 0 ), // path, or UUID, or LABEL, etc.
splitLine.at( 1 ), // mount point
splitLine.at( 2 ), // fs type
splitLine.at( 3 ), // options
splitLine.at( 4 ).toInt(), //dump
splitLine.at( 5 ).toInt() //pass
} );
}
fstabFile.close(); fstabFile.close();
std::remove_if( fstabEntries.begin(), fstabEntries.end(), [](const FstabEntry& x) { return !x.isValid(); } );
} }
if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) ) if ( QProcess::execute( "umount", { "-R", mountsDir.path() } ) )