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

suggestedMapperName as a separate method.

This commit is contained in:
Teo Mrnjavac 2016-04-22 16:48:31 +02:00
parent 433cb5651b
commit 8e3e9309ed
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fs/luks.cpp
View File

@ -105,7 +105,7 @@ bool luks::create(Report& report, const QString& deviceNode) const
args.push_back({ m_passphrase });
args.push_back({ QStringLiteral("luksOpen"),
deviceNode,
QStringLiteral("luks-") + readUUID(deviceNode) });
suggestedMapperName(deviceNode) });
ExternalCommand openCmd(commands, args);
if (!(openCmd.run(-1) && openCmd.exitCode() == 0))
@ -260,7 +260,7 @@ bool luks::cryptOpen(const QString& deviceNode)
args.push_back({ passphrase });
args.push_back({ QStringLiteral("luksOpen"),
deviceNode,
QStringLiteral("luks-") + readUUID(deviceNode) });
suggestedMapperName(deviceNode) });
delete dlg;
ExternalCommand cmd(commands, args);
@ -428,6 +428,11 @@ FileSystem::Type luks::type() const
return FileSystem::Luks;
}
QString luks::suggestedMapperName(const QString& deviceNode) const
{
return QStringLiteral("luks-") + readUUID(deviceNode);
}
QString luks::readLabel(const QString& deviceNode) const
{
if (m_isCryptOpen && m_innerFs)

2
src/fs/luks.h
View File

@ -121,6 +121,8 @@ public:
virtual FileSystem::Type type() const override;
QString suggestedMapperName(const QString& deviceNode) const;
static QString mapperName(const QString& deviceNode);
static QString getCipherName(const QString& deviceNode);