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

We no longer need to fill partition sizes. KPMCore now tracks max fs size (including inside luks).

This commit is contained in:
Andrius Štikonas 2016-05-11 23:00:37 +01:00
parent c291af2c83
commit 82243234e3
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fs/btrfs.cpp
View File

@ -145,8 +145,8 @@ bool btrfs::resize(Report& report, const QString& deviceNode, qint64 length) con
{ QStringLiteral("--verbose"), QStringLiteral("--types"), QStringLiteral("btrfs"), deviceNode, tempDir.path() }); { QStringLiteral("--verbose"), QStringLiteral("--types"), QStringLiteral("btrfs"), deviceNode, tempDir.path() });
if (mountCmd.run(-1) && mountCmd.exitCode() == 0) { if (mountCmd.run(-1) && mountCmd.exitCode() == 0) {
QString len = length == -1 ? QStringLiteral("max") : QString::number(length); ExternalCommand resizeCmd(report, QStringLiteral("btrfs"),
ExternalCommand resizeCmd(report, QStringLiteral("btrfs"), { QStringLiteral("filesystem"), QStringLiteral("resize"), len, tempDir.path() }); { QStringLiteral("filesystem"), QStringLiteral("resize"), QString::number(length), tempDir.path() });
if (resizeCmd.run(-1) && resizeCmd.exitCode() == 0) if (resizeCmd.run(-1) && resizeCmd.exitCode() == 0)
rval = true; rval = true;

3
src/fs/ext2.cpp
View File

@ -137,9 +137,8 @@ bool ext2::create(Report& report, const QString& deviceNode) const
bool ext2::resize(Report& report, const QString& deviceNode, qint64 length) const bool ext2::resize(Report& report, const QString& deviceNode, qint64 length) const
{ {
const QString len = QString::number(length / 512) + QStringLiteral("s"); const QString len = QString::number(length / 512) + QStringLiteral("s");
const QStringList args = length == -1 ? QStringList() << deviceNode : QStringList() << deviceNode << len;
ExternalCommand cmd(report, QStringLiteral("resize2fs"), args); ExternalCommand cmd(report, QStringLiteral("resize2fs"), { deviceNode, len });
return cmd.run(-1) && cmd.exitCode() == 0; return cmd.run(-1) && cmd.exitCode() == 0;
} }

6
src/fs/reiserfs.cpp
View File

@ -148,10 +148,8 @@ bool reiserfs::create(Report& report, const QString& deviceNode) const
bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) const bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) const
{ {
const QStringList args = length == -1 ? ExternalCommand cmd(report, QStringLiteral("resize_reiserfs"),
QStringList() << deviceNode << QStringLiteral("-q") : { deviceNode, QStringLiteral("-q"), QStringLiteral("-s"), QString::number(length) });
QStringList() << deviceNode << QStringLiteral("-q") << QStringLiteral("-s") << QString::number(length);
ExternalCommand cmd(report, QStringLiteral("resize_reiserfs"), args);
bool rval = cmd.start(-1); bool rval = cmd.start(-1);

2
src/ops/restoreoperation.cpp
View File

@ -30,8 +30,8 @@
#include "jobs/resizefilesystemjob.h" #include "jobs/resizefilesystemjob.h"
#include "fs/filesystem.h" #include "fs/filesystem.h"
#include "fs/luks.h"
#include "fs/filesystemfactory.h" #include "fs/filesystemfactory.h"
#include "fs/luks.h"
#include "util/capacity.h" #include "util/capacity.h"
#include "util/report.h" #include "util/report.h"