From 587a18a6fae7a34edd4a95ad79f69ad21dc8d1a7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 14 Dec 2021 12:50:27 +0100 Subject: [PATCH] [partition] Use runCommand() for future-proofing --- src/modules/partition/core/DeviceList.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index c7de12e88..423c3b4ee 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -11,6 +11,7 @@ #include "DeviceList.h" #include "partition/PartitionIterator.h" +#include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include @@ -43,11 +44,9 @@ hasRootPartition( Device* device ) static bool blkIdCheckIso9660( const QString& path ) { - QProcess blkid; - blkid.start( "blkid", { path } ); - blkid.waitForFinished(); - QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); - return output.contains( "iso9660" ); + // If blkid fails, there's no output, but we don't care + auto r = CalamaresUtils::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) ); + return r.getOutput().contains( "iso9660" ); } static bool