Move initLUKS from helpers to FS::luks.
This commit is contained in:
parent
c70945b116
commit
874900fe72
|
@ -130,7 +130,7 @@ Partition* LvmDevice::scanPartition(const QString& lvPath, PartitionTable* pTabl
|
||||||
// Handle LUKS partition
|
// Handle LUKS partition
|
||||||
if (fs->type() == FileSystem::Luks) {
|
if (fs->type() == FileSystem::Luks) {
|
||||||
r |= PartitionRole::Luks;
|
r |= PartitionRole::Luks;
|
||||||
initLuks(fs, this);
|
FS::luks::initLUKS(fs);
|
||||||
QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
|
QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
|
||||||
mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
|
mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
|
||||||
mounted = FileSystem::detectMountStatus(fs, mapperNode);
|
mounted = FileSystem::detectMountStatus(fs, mapperNode);
|
||||||
|
|
|
@ -21,8 +21,9 @@
|
||||||
|
|
||||||
#include "fs/filesystemfactory.h"
|
#include "fs/filesystemfactory.h"
|
||||||
|
|
||||||
#include "util/capacity.h"
|
|
||||||
#include "util/externalcommand.h"
|
#include "util/externalcommand.h"
|
||||||
|
#include "util/capacity.h"
|
||||||
|
#include "util/helpers.h"
|
||||||
#include "util/report.h"
|
#include "util/report.h"
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
|
@ -616,4 +617,18 @@ bool luks::canEncryptType(FileSystem::Type type)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void luks::initLUKS(FileSystem* fs)
|
||||||
|
{
|
||||||
|
if (fs->type() == FileSystem::Luks) {
|
||||||
|
FS::luks* luksFS = static_cast<FS::luks*>(fs);
|
||||||
|
QString mapperNode = luksFS->mapperName();
|
||||||
|
bool isCryptOpen = !mapperNode.isEmpty();
|
||||||
|
luksFS->setCryptOpen(isCryptOpen);
|
||||||
|
if (isCryptOpen) {
|
||||||
|
luksFS->loadInnerFileSystem(mapperNode);
|
||||||
|
luksFS->setMounted(::isMounted(mapperNode)); //isMounted from helpers.h
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,6 +163,7 @@ public:
|
||||||
qint64 payloadOffset() const { return m_PayloadOffset; };
|
qint64 payloadOffset() const { return m_PayloadOffset; };
|
||||||
|
|
||||||
static bool canEncryptType(FileSystem::Type type);
|
static bool canEncryptType(FileSystem::Type type);
|
||||||
|
static void initLUKS(FileSystem* fs);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual QString readOuterUUID(const QString& deviceNode) const;
|
virtual QString readOuterUUID(const QString& deviceNode) const;
|
||||||
|
|
|
@ -240,7 +240,7 @@ Device* LibPartedBackend::scanDevice(const QString& deviceNode)
|
||||||
// libparted does not handle LUKS partitions
|
// libparted does not handle LUKS partitions
|
||||||
if (fs->type() == FileSystem::Luks) {
|
if (fs->type() == FileSystem::Luks) {
|
||||||
r |= PartitionRole::Luks;
|
r |= PartitionRole::Luks;
|
||||||
initLuks(fs, d);
|
FS::luks::initLUKS(fs);
|
||||||
QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
|
QString mapperNode = static_cast<FS::luks*>(fs)->mapperName();
|
||||||
mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
|
mountPoint = FileSystem::detectMountPoint(fs, mapperNode);
|
||||||
mounted = FileSystem::detectMountStatus(fs, mapperNode);
|
mounted = FileSystem::detectMountStatus(fs, mapperNode);
|
||||||
|
|
|
@ -19,8 +19,6 @@
|
||||||
#include "util/helpers.h"
|
#include "util/helpers.h"
|
||||||
#include "util/externalcommand.h"
|
#include "util/externalcommand.h"
|
||||||
#include "util/globallog.h"
|
#include "util/globallog.h"
|
||||||
#include "fs/luks.h"
|
|
||||||
#include "core/device.h"
|
|
||||||
|
|
||||||
#include "ops/operation.h"
|
#include "ops/operation.h"
|
||||||
|
|
||||||
|
@ -86,21 +84,6 @@ bool isMounted(const QString& deviceNode)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void initLuks(FileSystem* fs, const Device* dev)
|
|
||||||
{
|
|
||||||
if (fs->type() == FileSystem::Luks) {
|
|
||||||
FS::luks* luksFS = static_cast<FS::luks*>(fs);
|
|
||||||
QString mapperNode = luksFS->mapperName();
|
|
||||||
bool isCryptOpen = !mapperNode.isEmpty();
|
|
||||||
luksFS->setCryptOpen(isCryptOpen);
|
|
||||||
luksFS->setLogicalSectorSize(dev->logicalSize());
|
|
||||||
if (isCryptOpen) {
|
|
||||||
luksFS->loadInnerFileSystem(mapperNode);
|
|
||||||
}
|
|
||||||
luksFS->setMounted(isMounted(mapperNode));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
KAboutData aboutKPMcore()
|
KAboutData aboutKPMcore()
|
||||||
{
|
{
|
||||||
KAboutData aboutData( QStringLiteral("kpmcore"),
|
KAboutData aboutData( QStringLiteral("kpmcore"),
|
||||||
|
|
|
@ -39,8 +39,6 @@ LIBKPMCORE_EXPORT bool checkAccessibleDevices();
|
||||||
|
|
||||||
LIBKPMCORE_EXPORT bool isMounted(const QString& deviceNode);
|
LIBKPMCORE_EXPORT bool isMounted(const QString& deviceNode);
|
||||||
|
|
||||||
LIBKPMCORE_EXPORT void initLuks(FileSystem* fs, const Device* dev);
|
|
||||||
|
|
||||||
LIBKPMCORE_EXPORT KAboutData aboutKPMcore();
|
LIBKPMCORE_EXPORT KAboutData aboutKPMcore();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue