diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index ab15f1a..7b77dcf 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -525,7 +525,9 @@ QString luks::readOuterUUID(const QString &deviceNode) const << "\toutput:" << cmd.output().trimmed(); return QString(); } - return cmd.output().trimmed(); + QString outerUuid = cmd.output().trimmed(); + const_cast< QString& >( m_outerUuid ) = outerUuid; + return outerUuid; } return QStringLiteral("---"); } @@ -611,6 +613,11 @@ void luks::getLuksInfo(const QString& deviceNode) } } +QString luks::outerUuid() const +{ + return m_outerUuid; +} + bool luks::canEncryptType(FileSystem::Type type) { switch (type) diff --git a/src/fs/luks.h b/src/fs/luks.h index 7ef75b3..41d1ac4 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -171,13 +171,14 @@ public: void getLuksInfo(const QString& deviceNode); FileSystem* innerFS() const { return m_innerFs; }; // avoid calling this unless necessary + QString outerUuid() const; - QString mapperName() const { return m_MapperName; }; - QString cipherName() const { return m_CipherName; }; - QString cipherMode() const { return m_CipherMode; }; - QString hashName() const { return m_HashName; }; - qint64 keySize() const { return m_KeySize; }; - qint64 payloadOffset() const { return m_PayloadOffset; }; + QString mapperName() const { return m_MapperName; } + QString cipherName() const { return m_CipherName; } + QString cipherMode() const { return m_CipherMode; } + QString hashName() const { return m_HashName; } + qint64 keySize() const { return m_KeySize; } + qint64 payloadOffset() const { return m_PayloadOffset; } static bool canEncryptType(FileSystem::Type type); static void initLUKS(FileSystem* fs); @@ -214,6 +215,7 @@ private: QString m_HashName; qint64 m_KeySize; qint64 m_PayloadOffset; + QString m_outerUuid; }; }