Sfdisk always creates RAID logical partitions with a 'p' character before partition number.

This commit is contained in:
Caio Carvalho 2018-07-10 23:03:21 -03:00
parent 6c27d99f2c
commit ae8987b82c
3 changed files with 11 additions and 1 deletions

View File

@ -166,6 +166,11 @@ QStringList SoftwareRAID::getDevicePathList(const QString &path)
return {};
}
bool SoftwareRAID::isRaidPath(const QString &path)
{
return !getDetail(path).isEmpty();
}
bool SoftwareRAID::createSoftwareRAID(Report &report,
const QString &name,
const QStringList devicePathList,

View File

@ -47,6 +47,8 @@ public:
static QString getUUID(const QString& path);
static QStringList getDevicePathList(const QString& path);
static bool isRaidPath(const QString& path);
static bool createSoftwareRAID(Report& report,
const QString& name,
const QStringList devicePathList,

View File

@ -22,6 +22,7 @@
#include "core/partition.h"
#include "core/device.h"
#include "core/raid/softwareraid.h"
#include "fs/filesystem.h"
@ -77,8 +78,10 @@ QString SfdiskPartitionTable::createPartition(Report& report, const Partition& p
QByteArrayLiteral(" size=") + QByteArray::number(partition.length()) + QByteArrayLiteral("\nwrite\n")) && createCommand.start(-1) && createCommand.waitFor() ) {
QRegularExpression re(QStringLiteral("Created a new partition (\\d)"));
QRegularExpressionMatch rem = re.match(createCommand.output());
// TODO: Needs refactoring. Workaround to check if device path is RAID and include 'p' character before partition number.
if (rem.hasMatch())
return partition.devicePath() + rem.captured(1);
return partition.devicePath() + (SoftwareRAID::isRaidPath(partition.devicePath()) ? QStringLiteral("p") : QStringLiteral("")) + rem.captured(1);
}
report.line() << xi18nc("@info:progress", "Failed to add partition <filename>%1</filename> to device <filename>%2</filename>.", partition.deviceNode(), m_device->deviceNode());