From 0a6de0c2f0680fdf9289c8f0e7a010ed11a5ba13 Mon Sep 17 00:00:00 2001
From: Chantara Tith <tith.chantara@gmail.com>
Date: Mon, 23 May 2016 17:29:33 +0700
Subject: [PATCH] Set VG name as PV mount point

---
 src/fs/lvm2_pv.cpp                         | 15 ++++++++++++++
 src/fs/lvm2_pv.h                           |  2 ++
 src/plugins/libparted/libpartedbackend.cpp | 23 ++++++++++++++++------
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp
index 6b0dbae..5a223b1 100644
--- a/src/fs/lvm2_pv.cpp
+++ b/src/fs/lvm2_pv.cpp
@@ -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();
+}
+
 }
diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h
index 6e38a76..e687d92 100644
--- a/src/fs/lvm2_pv.h
+++ b/src/fs/lvm2_pv.h
@@ -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;
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index b7751db..5e117bc 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -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() :