From 5d28790152176b44c5fd265d4dbffafc1f654a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Tue, 17 May 2016 17:35:49 +0100
Subject: [PATCH] Simplify Luks support tool (and do not init Luks filesystem).

---
 src/fs/luks.cpp | 29 +----------------------------
 src/fs/luks.h   |  1 -
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 1ee8b13..2f47fde 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -65,36 +65,9 @@ luks::~luks()
     delete m_innerFs;
 }
 
-void luks::init()
-{
-    m_Create = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
-    m_SetLabel = cmdSupportNone;
-    m_GetLabel = cmdSupportFileSystem;
-    m_UpdateUUID = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
-    m_Grow = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
-    m_Shrink = m_Grow;
-    m_Check = cmdSupportCore;
-    m_Copy = cmdSupportCore;
-    m_Move = cmdSupportCore;
-    m_Backup = cmdSupportCore;
-    m_GetUsed = cmdSupportNone; // libparted does not support LUKS, we do this as a special case
-    m_GetUUID = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
-}
-
 bool luks::supportToolFound() const
 {
-    m_cryptsetupFound =
-        m_GetLabel != cmdSupportNone &&
-//         m_SetLabel != cmdSupportNone && (only m_innerFs labels are supported)
-        m_Create != cmdSupportNone &&
-        m_Check != cmdSupportNone &&
-        m_UpdateUUID != cmdSupportNone &&
-        m_Grow != cmdSupportNone &&
-        m_Shrink != cmdSupportNone &&
-//         m_Copy != cmdSupportNone &&
-        m_Move != cmdSupportNone &&
-        m_Backup != cmdSupportNone &&
-        m_GetUUID != cmdSupportNone;
+    m_cryptsetupFound = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone;
     return m_cryptsetupFound &&
         ((m_isCryptOpen && m_innerFs) ? m_innerFs->supportToolFound() : true);
 }
diff --git a/src/fs/luks.h b/src/fs/luks.h
index 24960b0..1a1f4f4 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -44,7 +44,6 @@ public:
     virtual ~luks();
 
 public:
-    virtual void init() override;
     virtual qint64 readUsedCapacity(const QString& deviceNode) const override;
 
     virtual CommandSupportType supportGetUsed() const override {