Merge branch 'master' into kauth
This commit is contained in:
commit
4cae6f0632
|
@ -364,7 +364,7 @@ QString SfdiskBackend::readLabel(const QString& deviceNode) const
|
||||||
QStringLiteral("info"),
|
QStringLiteral("info"),
|
||||||
QStringLiteral("--query=property"),
|
QStringLiteral("--query=property"),
|
||||||
deviceNode });
|
deviceNode });
|
||||||
|
udevCommand.run();
|
||||||
QRegularExpression re(QStringLiteral("ID_FS_LABEL=(\\w+)"));
|
QRegularExpression re(QStringLiteral("ID_FS_LABEL=(\\w+)"));
|
||||||
QRegularExpressionMatch reFileSystemLabel = re.match(udevCommand.output());
|
QRegularExpressionMatch reFileSystemLabel = re.match(udevCommand.output());
|
||||||
if (reFileSystemLabel.hasMatch())
|
if (reFileSystemLabel.hasMatch())
|
||||||
|
@ -379,6 +379,7 @@ QString SfdiskBackend::readUUID(const QString& deviceNode) const
|
||||||
QStringLiteral("info"),
|
QStringLiteral("info"),
|
||||||
QStringLiteral("--query=property"),
|
QStringLiteral("--query=property"),
|
||||||
deviceNode });
|
deviceNode });
|
||||||
|
udevCommand.run();
|
||||||
QRegularExpression re(QStringLiteral("ID_FS_UUID=(\\w+)"));
|
QRegularExpression re(QStringLiteral("ID_FS_UUID=(\\w+)"));
|
||||||
QRegularExpressionMatch reFileSystemUUID = re.match(udevCommand.output());
|
QRegularExpressionMatch reFileSystemUUID = re.match(udevCommand.output());
|
||||||
if (reFileSystemUUID.hasMatch())
|
if (reFileSystemUUID.hasMatch())
|
||||||
|
|
Loading…
Reference in New Issue