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

Simplify Luks support tool (and do not init Luks filesystem).

This commit is contained in:
Andrius Štikonas 2016-05-17 17:35:49 +01:00
parent 927a6421fe
commit 5d28790152
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/fs/luks.cpp
View File

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

1
src/fs/luks.h
View File

@ -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 {