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

Try to find a more reliable way to read new partition UUIDs.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-06-04 19:34:30 +02:00
parent fff0f6f023
commit 30408d34a1
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -42,16 +42,20 @@ typedef QHash<QString, QString> UuidForPartitionHash;
static const char* UUID_DIR = "/dev/disk/by-uuid";
static UuidForPartitionHash
findPartitionUuids()
findPartitionUuids( QList < Device* > devices )
{
cDebug() << "Gathering UUIDs for partitions that exist now.";
QDir dir( UUID_DIR );
UuidForPartitionHash hash;
for ( auto info : dir.entryInfoList( QDir::Files ) )
foreach ( Device* device, devices )
{
QString uuid = info.fileName();
QString path = info.canonicalFilePath();
hash.insert( path, uuid );
for ( auto it = PartitionIterator::begin( device );
it != PartitionIterator::end( device ); ++it )
{
Partition* p = *it;
QString path = p->partitionPath();
QString uuid = p->fileSystem().readUUID( p->partitionPath() );
hash.insert( path, uuid );
}
}
cDebug() << hash;
return hash;
@ -156,7 +160,7 @@ FillGlobalStorageJob::exec()
QVariant
FillGlobalStorageJob::createPartitionList() const
{
UuidForPartitionHash hash = findPartitionUuids();
UuidForPartitionHash hash = findPartitionUuids( m_devices );
QVariantList lst;
cDebug() << "Writing to GlobalStorage[\"partitions\"]";
for ( auto device : m_devices )