[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kpmcore] src/fs: Add FS::luks::outerUuid().
From:       Teo Mrnjavac <teo () kde ! org>
Date:       2016-11-30 15:42:08
Message-ID: E1cC71M-0006Z1-Ju () code ! kde ! org
[Download RAW message or body]

Git commit 5e4001723824bcf6073dc39d2490df27f4129453 by Teo Mrnjavac.
Committed on 30/11/2016 at 15:42.
Pushed by mrnjavac into branch 'master'.

Add FS::luks::outerUuid().

M  +8    -1    src/fs/luks.cpp
M  +8    -6    src/fs/luks.h

https://commits.kde.org/kpmcore/5e4001723824bcf6073dc39d2490df27f4129453

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;
 };
 }
 

[prev in list] [next in list] [prev in thread] [next in thread]