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

[partition] Use runCommand() for future-proofing

Browse Source
This commit is contained in:
Adriaan de Groot 2021-12-14 12:50:27 +01:00
parent 043619cd4b
commit 587a18a6fa
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/partition/core/DeviceList.cpp
View File

@ -11,6 +11,7 @@
#include "DeviceList.h" #include "DeviceList.h"
#include "partition/PartitionIterator.h" #include "partition/PartitionIterator.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include <kpmcore/backend/corebackend.h> #include <kpmcore/backend/corebackend.h>
@ -43,11 +44,9 @@ hasRootPartition( Device* device )
static bool static bool
blkIdCheckIso9660( const QString& path ) blkIdCheckIso9660( const QString& path )
{ {
QProcess blkid; // If blkid fails, there's no output, but we don't care
blkid.start( "blkid", { path } ); auto r = CalamaresUtils::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) );
blkid.waitForFinished(); return r.getOutput().contains( "iso9660" );
QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() );
return output.contains( "iso9660" );
} }
static bool static bool