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

check return codes from external commands in fs classes 

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1127069
This commit is contained in:
Volker Lanz 2010-05-15 13:10:34 +00:00
parent bf02314ff3
commit d82e50e5d5
10 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fs/ext2.cpp
View File

@ -105,7 +105,8 @@ namespace FS
bool ext2::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.ext2", QStringList() << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.ext2", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool ext2::resize(Report& report, const QString& deviceNode, qint64 length) const
@ -117,11 +118,13 @@ namespace FS
bool ext2::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
{
return ExternalCommand(report, "e2label", QStringList() << deviceNode << newLabel).run(-1);
ExternalCommand cmd(report, "e2label", QStringList() << deviceNode << newLabel);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool ext2::updateUUID(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "tune2fs", QStringList() << "-U" << "random" << deviceNode).run(-1);
ExternalCommand cmd(report, "tune2fs", QStringList() << "-U" << "random" << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

3
src/fs/ext3.cpp
View File

@ -32,6 +32,7 @@ namespace FS
bool ext3::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.ext3", QStringList() << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.ext3", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

3
src/fs/ext4.cpp
View File

@ -32,6 +32,7 @@ namespace FS
bool ext4::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.ext4", QStringList() << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.ext4", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

3
src/fs/hfs.cpp
View File

@ -67,6 +67,7 @@ namespace FS
bool hfs::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "hformat", QStringList() << deviceNode).run(-1);
ExternalCommand cmd(report, "hformat", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

6
src/fs/jfs.cpp
View File

@ -106,7 +106,8 @@ namespace FS
bool jfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
{
return ExternalCommand(report, "jfs_tune", QStringList() << "-L" << newLabel << deviceNode).run(-1);
ExternalCommand cmd(report, "jfs_tune", QStringList() << "-L" << newLabel << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool jfs::check(Report& report, const QString& deviceNode) const
@ -117,7 +118,8 @@ namespace FS
bool jfs::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.jfs", QStringList() << "-q" << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.jfs", QStringList() << "-q" << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool jfs::resize(Report& report, const QString& deviceNode, qint64) const

15
src/fs/linuxswap.cpp
View File

@ -50,7 +50,8 @@ namespace FS
bool linuxswap::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkswap", QStringList() << deviceNode).run(-1);
ExternalCommand cmd(report, "mkswap", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool linuxswap::resize(Report& report, const QString& deviceNode, qint64) const
@ -62,12 +63,14 @@ namespace FS
args << "-L" << label;
args << deviceNode;
return ExternalCommand(report, "mkswap", args).run(-1);
ExternalCommand cmd(report, "mkswap", args);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool linuxswap::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
{
return ExternalCommand(report, "mkswap", QStringList() << "-L" << newLabel << deviceNode).run(-1);
ExternalCommand cmd(report, "mkswap", QStringList() << "-L" << newLabel << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
QString linuxswap::mountTitle() const
@ -82,11 +85,13 @@ namespace FS
bool linuxswap::mount(const QString& deviceNode)
{
return ExternalCommand("swapon", QStringList() << deviceNode).run(-1);
ExternalCommand cmd("swapon", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool linuxswap::unmount(const QString& deviceNode)
{
return ExternalCommand("swapoff", QStringList() << deviceNode).run(-1);
ExternalCommand cmd("swapoff", QStringList() << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

3
src/fs/ntfs.cpp
View File

@ -117,7 +117,8 @@ namespace FS
bool ntfs::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.ntfs", QStringList() << "-f" << "-vv" << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.ntfs", QStringList() << "-f" << "-vv" << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool ntfs::copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const

3
src/fs/reiser4.cpp
View File

@ -88,6 +88,7 @@ namespace FS
bool reiser4::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.reiser4", QStringList() << "--yes" << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.reiser4", QStringList() << "--yes" << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

9
src/fs/reiserfs.cpp
View File

@ -105,7 +105,8 @@ namespace FS
bool reiserfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
{
return ExternalCommand(report, "reiserfstune", QStringList() << "-l" << newLabel << deviceNode).run(-1);
ExternalCommand cmd(report, "reiserfstune", QStringList() << "-l" << newLabel << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool reiserfs::check(Report& report, const QString& deviceNode) const
@ -116,7 +117,8 @@ namespace FS
bool reiserfs::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.reiserfs", QStringList() << "-f" << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.reiserfs", QStringList() << "-f" << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) const
@ -137,6 +139,7 @@ namespace FS
bool reiserfs::updateUUID(Report& report, const QString& deviceNode) const
{
const QString uuid = QUuid::createUuid().toString().remove(QRegExp("\\{|\\}"));
return ExternalCommand(report, "reiserfstune", QStringList() << "-u" << uuid << deviceNode).run(-1);
ExternalCommand cmd(report, "reiserfstune", QStringList() << "-u" << uuid << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
}

6
src/fs/xfs.cpp
View File

@ -100,7 +100,8 @@ namespace FS
bool xfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
{
return ExternalCommand(report, "xfs_db", QStringList() << "-x" << "-c" << "sb 0" << "-c" << QString("label " + newLabel) << deviceNode).run(-1);
ExternalCommand cmd(report, "xfs_db", QStringList() << "-x" << "-c" << "sb 0" << "-c" << QString("label " + newLabel) << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool xfs::check(Report& report, const QString& deviceNode) const
@ -111,7 +112,8 @@ namespace FS
bool xfs::create(Report& report, const QString& deviceNode) const
{
return ExternalCommand(report, "mkfs.xfs", QStringList() << "-f" << deviceNode).run(-1);
ExternalCommand cmd(report, "mkfs.xfs", QStringList() << "-f" << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool xfs::copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const