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

Get rid of unused LVM flag for LVM LV.

This commit is contained in:
Andrius Štikonas 2016-07-29 15:46:00 +01:00
parent 1c7dd64e68
commit fd8c81921e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/lvmdevice.cpp
View File

@ -90,7 +90,7 @@ Partition* LvmDevice::scanPartition(const QString& lvpath, const LvmDevice& dev,
* 1. representing the actual LV start from 0 -> size of LV - 1 * 1. representing the actual LV start from 0 -> size of LV - 1
* 2. representing abstract LV's sector inside a VG partitionTable * 2. representing abstract LV's sector inside a VG partitionTable
* start from last sector + 1 of last Partitions -> size of LV - 1 * start from last sector + 1 of last Partitions -> size of LV - 1
* Reason for this is for the LV Partition to worrks nicely with other parts of the codebase * Reason for this is for the LV Partition to work nicely with other parts of the codebase
* without too many special cases. * without too many special cases.
*/ */
@ -157,7 +157,7 @@ Partition* LvmDevice::scanPartition(const QString& lvpath, const LvmDevice& dev,
startSector, startSector,
endSector, endSector,
lvpath, lvpath,
PartitionTable::Flag::FlagLvm, PartitionTable::Flag::FlagNone,
mountPoint, mountPoint,
mounted); mounted);
return part; return part;

2
src/fs/luks.cpp
View File

@ -484,7 +484,7 @@ bool luks::resize(Report& report, const QString& deviceNode, qint64 newLength) c
} }
else if (m_innerFs->resize(report, mapperNode, payloadLength)) else if (m_innerFs->resize(report, mapperNode, payloadLength))
{ {
ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"), ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"),
{ QStringLiteral("--size"), QString::number(payloadLength / /*m_logicalSectorSize*/ 512), // LUKS assume 512 bytes sector { QStringLiteral("--size"), QString::number(payloadLength / /*m_logicalSectorSize*/ 512), // LUKS assume 512 bytes sector
QStringLiteral("resize"), mapperNode }); QStringLiteral("resize"), mapperNode });
report.line() << xi18nc("@info:progress", "Resizing LUKS crypt on partition <filename>%1</filename>.", deviceNode); report.line() << xi18nc("@info:progress", "Resizing LUKS crypt on partition <filename>%1</filename>.", deviceNode);