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

Set VG name as PV mount point

This commit is contained in:
Chantara Tith 2016-05-23 17:29:33 +07:00 committed by Andrius Štikonas
parent c96682d022
commit 0a6de0c2f0
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fs/lvm2_pv.cpp
View File

@ -22,6 +22,7 @@
#include "util/capacity.h"
#include <QString>
#include <QRegularExpression>
namespace FS
{
@ -117,4 +118,18 @@ bool lvm2_pv::canMount(const QString & deviceNode, const QString & mountPoint) c
Q_UNUSED(mountPoint)
return false;
}
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();
}
}

2
src/fs/lvm2_pv.h
View File

@ -93,6 +93,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;

23
src/plugins/libparted/libpartedbackend.cpp
View File

@ -36,6 +36,7 @@
#include "fs/hfs.h"
#include "fs/hfsplus.h"
#include "fs/luks.h"
#include "fs/lvm2_pv.h"
#include "util/globallog.h"
#include "util/externalcommand.h"
@ -252,12 +253,18 @@ Device* LibPartedBackend::scanDevice(const QString& deviceNode)
if (isCryptOpen) {
luksFs->loadInnerFileSystem(partitionNode, 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())
@ -268,6 +275,10 @@ Device* LibPartedBackend::scanDevice(const QString& deviceNode)
}
luksFs->setMounted(mounted);
} else if (type == FileSystem::Lvm2_PV) {
//TODO: adding PartitionRole
mountPoint = FS::lvm2_pv::getVGName(node);
mounted = false;
} else {
mountPoint = mountPoints.findByDevice(partitionNode) ?
mountPoints.findByDevice(partitionNode)->mountPoint() :