diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index 5af3c7c..c47ffef 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -22,6 +22,7 @@ #include "util/capacity.h" #include +#include namespace FS { @@ -110,4 +111,18 @@ bool lvm2_pv::updateUUID(Report& report, const QString& deviceNode) const ExternalCommand cmd(report, QStringLiteral("lvm"), { QStringLiteral("pvchange"), QStringLiteral("--uuid"), deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } + +QString lvm2_pv::getVGName(const QString& deviceNode) //PV node +{ + ExternalCommand cmd( QStringLiteral("lvm"), + { QStringLiteral("pvdisplay"), QStringLiteral("--verbose"), deviceNode }); + if (cmd.run(-1) && cmd.exitCode() == 0) { + QRegularExpression re(QStringLiteral("VG Name\\h+(\\w+)")); + QRegularExpressionMatch vgName = re.match(cmd.output()); + if (vgName.hasMatch()) + return vgName.captured(1); + } + return QString(); +} + } diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index 398fce5..a63ff5c 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -92,6 +92,8 @@ public: SupportTool supportToolName() const override; bool supportToolFound() const override; + static QString getVGName(const QString& deviceNode); + public: static CommandSupportType m_GetUsed; static CommandSupportType m_GetLabel; diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp index a6fa3c4..2f4eec4 100644 --- a/src/plugins/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -35,6 +35,7 @@ #include "fs/hfs.h" #include "fs/hfsplus.h" #include "fs/luks.h" +#include "fs/lvm2_pv.h" #include "util/globallog.h" #include "util/helpers.h" @@ -369,12 +370,18 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk) if (isCryptOpen) { luksFs->loadInnerFileSystem(node, mapperNode); - mountPoint = mountPoints.findByDevice(mapperNode) ? - mountPoints.findByDevice(mapperNode)->mountPoint() : - QString(); - // We cannot use libparted to check the mounted status because - // we don't have a PedPartition for the mapper device, so we use lsblk - mounted = isMounted(mapperNode); + if (luksFs->type() == FileSystem::Lvm2_PV) { + mountPoint = FS::lvm2_pv::getVGName(mapperNode); + mounted = false; + } else { + + mountPoint = mountPoints.findByDevice(mapperNode) ? + mountPoints.findByDevice(mapperNode)->mountPoint() : + QString(); + // We cannot use libparted to check the mounted status because + // we don't have a PedPartition for the mapper device, so we use lsblk + mounted = isMounted(mapperNode); + } if (mounted) { const KDiskFreeSpaceInfo freeSpaceInfo = KDiskFreeSpaceInfo::freeSpaceInfo(mountPoint); if (freeSpaceInfo.isValid() && mountPoint != QString()) @@ -385,6 +392,10 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk) } luksFs->setMounted(mounted); + } else if (type == FileSystem::Lvm2_PV) { + //TODO: adding PartitionRole + mountPoint = FS::lvm2_pv::getVGName(node); + mounted = false; } else { mountPoint = mountPoints.findByDevice(node) ? mountPoints.findByDevice(node)->mountPoint() :