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

Only enable deactivation of LUKS volume if cryptsetup is found.

This commit is contained in:
Andrius Štikonas 2016-04-28 21:56:03 +01:00
parent ea4b945ebb
commit 25e28a0e16
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fs/luks.cpp
View File

@ -82,7 +82,7 @@ void luks::init()
bool luks::supportToolFound() const
{
return
m_cryptsetupFound =
// m_GetUsed != cmdSupportNone &&
m_GetLabel != cmdSupportNone &&
m_SetLabel != cmdSupportNone &&
@ -94,7 +94,8 @@ bool luks::supportToolFound() const
m_Copy != cmdSupportNone &&
m_Move != cmdSupportNone &&
m_Backup != cmdSupportNone &&
m_GetUUID != cmdSupportNone &&
m_GetUUID != cmdSupportNone;
return m_cryptsetupFound &&
((m_isCryptOpen && m_innerFs) ? m_innerFs->supportToolFound() : true);
}
@ -215,7 +216,7 @@ bool luks::canCryptOpen(const QString&) const
bool luks::canCryptClose(const QString&) const
{
return m_isCryptOpen && !m_isMounted;
return m_isCryptOpen && !m_isMounted && m_cryptsetupFound;
}
bool luks::isCryptOpen() const

1
src/fs/luks.h
View File

@ -163,6 +163,7 @@ private:
mutable FileSystem* m_innerFs;
mutable bool m_isCryptOpen;
mutable bool m_cryptsetupFound;
QString m_passphrase;
bool m_isMounted;
};