andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Always use outer UUID for mapper name.

This commit is contained in:
Teo Mrnjavac 2016-05-05 14:15:39 +02:00
parent 0bd44b94dc
commit 6013b5887c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fs/luks.cpp
View File

@ -454,7 +454,7 @@ FileSystem::Type luks::type() const
QString luks::suggestedMapperName(const QString& deviceNode) const
{
return QStringLiteral("luks-") + readUUID(deviceNode);
return QStringLiteral("luks-") + readOuterUUID(deviceNode);
}
QString luks::readLabel(const QString& deviceNode) const
@ -507,6 +507,11 @@ QString luks::readUUID(const QString& deviceNode) const
{
if (m_isCryptOpen && m_innerFs)
return m_innerFs->readUUID(mapperName(deviceNode));
return readOuterUUID(deviceNode);
}
QString luks::readOuterUUID(const QString &deviceNode) const
{
ExternalCommand cmd(QStringLiteral("cryptsetup"),
{ QStringLiteral("luksUUID"), deviceNode });
if (cmd.run()) {

3
src/fs/luks.h
View File

@ -149,6 +149,9 @@ public:
static QString getPayloadOffset(const QString& deviceNode);
static bool canEncryptType(FileSystem::Type type);
protected:
virtual QString readOuterUUID(const QString& deviceNode) const;
public:
static CommandSupportType m_GetUsed;
static CommandSupportType m_GetLabel;