From 6b558f49d8a090046d6ab09bc3302eee8981d78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 13 Apr 2018 13:08:43 +0300 Subject: [PATCH] Use blockdev --rereadpt instead of partx --update. --- src/jobs/setfilesystemlabeljob.cpp | 2 ++ src/plugins/sfdisk/sfdiskpartitiontable.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jobs/setfilesystemlabeljob.cpp b/src/jobs/setfilesystemlabeljob.cpp index 7ea7a07..ea1402b 100644 --- a/src/jobs/setfilesystemlabeljob.cpp +++ b/src/jobs/setfilesystemlabeljob.cpp @@ -61,6 +61,8 @@ bool SetFileSystemLabelJob::run(Report& parent) partition().fileSystem().setLabel(label()); } + // FIXME: need to commit to device + jobFinished(*report, rval); return rval; diff --git a/src/plugins/sfdisk/sfdiskpartitiontable.cpp b/src/plugins/sfdisk/sfdiskpartitiontable.cpp index 9124107..a33dbc9 100644 --- a/src/plugins/sfdisk/sfdiskpartitiontable.cpp +++ b/src/plugins/sfdisk/sfdiskpartitiontable.cpp @@ -55,8 +55,8 @@ bool SfdiskPartitionTable::open() bool SfdiskPartitionTable::commit(quint32 timeout) { if ( !(ExternalCommand(QStringLiteral("udevadm"), { QStringLiteral("settle"), QStringLiteral("--timeout=") + QString::number(timeout) }).run() && - ExternalCommand(QStringLiteral("partx"), { QStringLiteral("--update"), m_device->deviceNode() }).run()) ) - sleep(timeout); + ExternalCommand(QStringLiteral("blockdev"), { QStringLiteral("--rereadpt"), m_device->deviceNode() }).run())) + sleep(1); return true; }