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

Merge branch 'master' into sfdisk

This commit is contained in:
Andrius Štikonas 2017-12-24 23:38:39 +00:00
parent 5123411f1f 3f562ab0f0
commit 97ccd8d154
1 changed files with 4 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

@ -316,7 +316,7 @@ bool luks::cryptClose(const QString& deviceNode)
m_innerFs = nullptr; m_innerFs = nullptr;
m_passphrase.clear(); m_passphrase.clear();
setLabel({}); setLabel(FileSystem::readLabel(deviceNode));
setUUID(readUUID(deviceNode)); setUUID(readUUID(deviceNode));
setSectorsUsed(-1); setSectorsUsed(-1);
@ -469,11 +469,12 @@ QString luks::suggestedMapperName(const QString& deviceNode) const
return QStringLiteral("luks-") + readOuterUUID(deviceNode); return QStringLiteral("luks-") + readOuterUUID(deviceNode);
} }
QString luks::readLabel(const QString&) const QString luks::readLabel(const QString& deviceNode) const
{ {
if (m_isCryptOpen && m_innerFs) if (m_isCryptOpen && m_innerFs)
return m_innerFs->readLabel(mapperName()); return m_innerFs->readLabel(mapperName());
return QString();
return FileSystem::readLabel(deviceNode);
} }
bool luks::writeLabel(Report& report, const QString&, const QString& newLabel) bool luks::writeLabel(Report& report, const QString&, const QString& newLabel)