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

List:       kde-commits
Subject:    [kpmcore/luks-decorator] src/fs: Always use outer UUID for mapper name.
From:       Teo Mrnjavac <teo () kde ! org>
Date:       2016-05-05 12:15:59
Message-ID: E1ayICF-0008Q9-KP () scm ! kde ! org
[Download RAW message or body]

Git commit 6013b5887cf8a82666ece5a68e4326f81d7d6dd4 by Teo Mrnjavac.
Committed on 05/05/2016 at 12:15.
Pushed by mrnjavac into branch 'luks-decorator'.

Always use outer UUID for mapper name.

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

http://commits.kde.org/kpmcore/6013b5887cf8a82666ece5a68e4326f81d7d6dd4

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 3d51077..9637eba 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -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()) {
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 1fb1573..f6c13f8 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -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;
[prev in list] [next in list] [prev in thread] [next in thread]