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

Merge branch 'master' into kauth

This commit is contained in:
Andrius Štikonas 2018-06-15 20:40:29 +01:00
parent 83847a705e 358957641b
commit dc248c3011
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/partition.h
View File

@ -80,10 +80,10 @@ public:
New, /**< from a NewOperation */
Copy, /**< from a CopyOperation */
Restore, /**< from a RestoreOperation */
StateNone __attribute__((deprecated("Use Partition::State::None"))) = None,
StateNew __attribute__((deprecated("Use Partition::State::New"))) = New,
StateCopy __attribute__((deprecated("Use Partition::State::Copy"))) = Copy,
StateRestore __attribute__((deprecated("Use Partition::State::Restore"))) = Restore
StateNone = None,
StateNew = New,
StateCopy = Copy,
StateRestore = Restore
};
Partition(PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem* fs, qint64 sectorStart, qint64 sectorEnd, QString partitionPath, PartitionTable::Flags availableFlags = PartitionTable::FlagNone, const QString& mountPoint = QString(), bool mounted = false, PartitionTable::Flags activeFlags = PartitionTable::FlagNone, State state = State::None);

3
src/plugins/dummy/pmdummybackendplugin.json
View File

@ -13,6 +13,8 @@
"Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.",
"Description[es]": "Un motor de simulación para el gestor de particiones de KDE para hacer pruebas.",
"Description[gl]": "Unha infraestrutura de probas para o xestor de particións de KDE.",
"Description[it]": "Un motore fittizio del gestore delle partizioni di KDE per scopi di prova.",
"Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden",
"Description[pt]": "Uma infra-estrutura de testes para o Gestor de Partições do KDE.",
"Description[sk]": "Testovací program v pozadí KDE Správcu partícií",
@ -32,6 +34,7 @@
"Name[es]": "Motor de simulación para el gestor de particiones de KDE",
"Name[fi]": "KDE:n osionhallinnan valetaustaosa",
"Name[fr]": "Moteur de test pour le gestionnaire de partitions de KDE",
"Name[gl]": "Infraestrutura de probas para o xestor de particións de KDE",
"Name[id]": "Backend Tiruan Pengelola Partisi KDE",
"Name[it]": "Motore fittizio del gestore delle partizioni di KDE",
"Name[nb]": "Attrapp-motor for KDE partisjonsbehandler",

3
src/plugins/sfdisk/pmsfdiskbackendplugin.json
View File

@ -13,6 +13,8 @@
"Description[ca]": "Un dorsal «sfdisk» del gestor de particions del KDE.",
"Description[de]": "Ein sfdisk-Backend für die KDE-Partitionsverwaltung.",
"Description[es]": "Motor sfdisk para el gestor de particiones de KDE.",
"Description[gl]": "Unha infraestrutura de sfdisk para o xestor de particións de KDE.",
"Description[it]": "Un motore sfdisk del gestore delle partizioni di KDE.",
"Description[nl]": "Een sfdisk backend van KDE-partitiebeheerder.",
"Description[pt]": "A infra-estrutura do 'sfdisk' para o Gestor de Partições do KDE.",
"Description[sk]": "Backend KDE správcu partícií sfdisk.",
@ -28,6 +30,7 @@
"Name[ca]": "Dorsal «sfdisk» del gestor de particions del KDE",
"Name[de]": "KDE-Partitionsverwaltung sfdisk-Backend",
"Name[es]": "Motor sfdisk para el gestor de particiones de KDE",
"Name[gl]": "Infraestrutura de sfdisk para o xestor de particións de KDE",
"Name[it]": "Motore sfdisk del gestore delle partizioni di KDE",
"Name[nl]": "Sfdisk backend van KDE-partitiebeheerder",
"Name[pt]": "Infra-Estrutura do Sfdisk para o Gestor de Partições do KDE",

17
src/plugins/sfdisk/sfdiskbackend.cpp
View File

@ -182,6 +182,23 @@ Device* SfdiskBackend::scanDevice(const QString& deviceNode)
scanDevicePartitions(*d, partitionTable[QLatin1String("partitions")].toArray());
return d;
}
else
{
// Look if this device is a LVM VG
ExternalCommand checkVG(QStringLiteral("lvm"), { QStringLiteral("vgdisplay"), deviceNode });
if (checkVG.run(-1) && checkVG.exitCode() == 0)
{
qDebug() << "Trying to find LVM VG";
QList<Device *> availableDevices = scanDevices();
LvmDevice::scanSystemLVM(availableDevices);
for (Device *device : qAsConst(availableDevices))
if (device->deviceNode() == deviceNode)
return device;
}
}
return nullptr;
}