Decouple VG scan and system scan.

This commit is contained in:
Chantara Tith 2016-08-08 10:43:52 +07:00 committed by Andrius Štikonas
parent 77ff25e160
commit 5befd7484e
2 changed files with 15 additions and 9 deletions

View File

@ -182,13 +182,8 @@ Partition* LvmDevice::scanPartition(const QString& lvpath, PartitionTable* pTabl
QList<LvmDevice*> LvmDevice::scanSystemLVM()
{
QList<LvmDevice*> lvmList;
QString output = getField(QStringLiteral("vg_name"));
if (!output.isEmpty()) {
QStringList vgnameList = output.split(QStringLiteral("\n"), QString::SkipEmptyParts);
foreach(QString vgname, vgnameList) {
lvmList.append(new LvmDevice(vgname.trimmed()));
}
foreach (QString vgname, getVGs()) {
lvmList.append(new LvmDevice(vgname));
}
return lvmList;
}
@ -218,8 +213,18 @@ QStringList LvmDevice::lvPathList() const
return *LVPathList();
}
QStringList LvmDevice::getVGs()
{
QStringList vgList;
QString output = getField(QStringLiteral("vg_name"));
if (!output.isEmpty()) {
QStringList vgnameList = output.split(QStringLiteral("\n"), QString::SkipEmptyParts);
foreach(QString vgname, vgnameList) {
vgList.append(vgname.trimmed());
}
}
return vgList;
}
QStringList LvmDevice::getPVs(const QString& vgname)
{

View File

@ -68,6 +68,7 @@ public:
static QStringList getPVs(const QString& vgname);
static QStringList getLVs(const QString& vgname);
static QStringList getVGs();
static bool removeLV(Report& report, LvmDevice& dev, Partition& part);
static bool createLV(Report& report, LvmDevice& dev, Partition& part, const QString& lvname);