Fix creation of encrypted volumes
We can't rely on the order of lsblk. Check for the type=crypt instead. BUG: 379205
This commit is contained in:
parent
bd3a469b0b
commit
b10577e1c7
|
@ -562,13 +562,12 @@ void luks::getMapperName(const QString& deviceNode)
|
||||||
{ QStringLiteral("--list"),
|
{ QStringLiteral("--list"),
|
||||||
QStringLiteral("--noheadings"),
|
QStringLiteral("--noheadings"),
|
||||||
QStringLiteral("--output"),
|
QStringLiteral("--output"),
|
||||||
QStringLiteral("name"),
|
QStringLiteral("type,name"),
|
||||||
deviceNode });
|
deviceNode });
|
||||||
if (cmd.run(-1) && cmd.exitCode() == 0) {
|
if (cmd.run(-1) && cmd.exitCode() == 0) {
|
||||||
QStringList output=cmd.output().split(QStringLiteral("\n"));
|
QStringList output=cmd.output().split(QStringLiteral("\n")).filter(QRegularExpression(QStringLiteral("^crypt ")));
|
||||||
output.removeFirst();
|
if (!output.isEmpty() && !output.first().isEmpty())
|
||||||
if (!output.first().isEmpty())
|
m_MapperName = QStringLiteral("/dev/mapper/") + output.first().split(QStringLiteral(" ")).last();
|
||||||
m_MapperName = QStringLiteral("/dev/mapper/") + output.first();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
m_MapperName = QString();
|
m_MapperName = QString();
|
||||||
|
|
Loading…
Reference in New Issue