PartitionRole::LUKS is now PartitionRole::Luks.
This commit is contained in:
parent
b4a57db54d
commit
26026b6232
|
@ -37,7 +37,7 @@ QString PartitionRole::toString() const
|
||||||
if (roles() & Primary)
|
if (roles() & Primary)
|
||||||
return i18nc("@item partition role", "primary");
|
return i18nc("@item partition role", "primary");
|
||||||
|
|
||||||
if (roles() & LUKS)
|
if (roles() & Luks)
|
||||||
return i18nc("@item partition role", "LUKS");
|
return i18nc("@item partition role", "LUKS");
|
||||||
|
|
||||||
return i18nc("@item partition role", "none");
|
return i18nc("@item partition role", "none");
|
||||||
|
|
|
@ -42,7 +42,7 @@ public:
|
||||||
Extended = 2, /**< Extended */
|
Extended = 2, /**< Extended */
|
||||||
Logical = 4, /**< Logical inside an extended */
|
Logical = 4, /**< Logical inside an extended */
|
||||||
Unallocated = 8, /**< No real Partition, just unallocated space */
|
Unallocated = 8, /**< No real Partition, just unallocated space */
|
||||||
LUKS = 16, /**< Encrypted partition with LUKS key management */
|
Luks = 16, /**< Encrypted partition with LUKS key management */
|
||||||
|
|
||||||
Any = 255 /**< In case we're looking for a Partition with a PartitionRole, any will do */
|
Any = 255 /**< In case we're looking for a Partition with a PartitionRole, any will do */
|
||||||
};
|
};
|
||||||
|
|
|
@ -353,7 +353,7 @@ void LibPartedBackend::scanDevicePartitions(PedDevice*, Device& d, PedDisk* pedD
|
||||||
QString mountPoint;
|
QString mountPoint;
|
||||||
bool mounted = false;
|
bool mounted = false;
|
||||||
if (fs->type() == FileSystem::Luks) {
|
if (fs->type() == FileSystem::Luks) {
|
||||||
r |= PartitionRole::LUKS;
|
r |= PartitionRole::Luks;
|
||||||
FS::luks* luksFs = dynamic_cast<FS::luks*>(fs);
|
FS::luks* luksFs = dynamic_cast<FS::luks*>(fs);
|
||||||
QString mapperNode = FS::luks::mapperName(node);
|
QString mapperNode = FS::luks::mapperName(node);
|
||||||
bool isCryptOpen = !mapperNode.isEmpty();
|
bool isCryptOpen = !mapperNode.isEmpty();
|
||||||
|
|
Loading…
Reference in New Issue