Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 10:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

partitionmanager: simplify NTFS UUID update

Browse source 
upstream commit:
a412564b00

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-03-21 08:08:48 +02:00
parent 97c2720a62
commit 416c668abf
1 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
partitionmanager/src/fs/ntfs.cpp
View file

@ -30,7 +30,6 @@
#include <QString>
#include <QStringList>
#include <QFile>
#include <QUuid>
#include <ctime>
#include <algorithm>
@ -63,7 +62,7 @@ namespace FS
m_Create = findExternal("mkfs.ntfs") ? cmdSupportFileSystem : cmdSupportNone;
m_Copy = findExternal("ntfsclone") ? cmdSupportFileSystem : cmdSupportNone;
m_Backup = cmdSupportCore;
m_UpdateUUID = findExternal("dd") ? cmdSupportFileSystem : cmdSupportNone;
m_UpdateUUID = m_SetLabel;
m_Move = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone;
m_GetUUID = cmdSupportCore;
}
@ -87,7 +86,7 @@ namespace FS
FileSystem::SupportTool ntfs::supportToolName() const
{
return SupportTool("ntfsprogs", KUrl("http://www.tuxera.com/community/open-source-ntfs-3g/"));
return SupportTool("ntfs-3g", KUrl("https://github.com/tuxera/ntfs-3g"));
}
qint64 ntfs::minCapacity() const
@ -155,9 +154,9 @@ namespace FS
bool ntfs::copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const
{
ExternalCommand cmd(report, "ntfsclone", QStringList() << "-f" << "--overwrite" << targetDeviceNode << sourceDeviceNode);
ExternalCommand cmd(report, "ntfsclone", QStringList() << "-f" << "--overwrite" << targetDeviceNode << sourceDeviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool ntfs::resize(Report& report, const QString& deviceNode, qint64 length) const
@ -180,17 +179,9 @@ namespace FS
bool ntfs::updateUUID(Report& report, const QString& deviceNode) const
{
QUuid uuid = QUuid::createUuid();
ExternalCommand cmd(report, "ntfslabel", QStringList() << "--new-serial" << deviceNode);
ExternalCommand cmd(report, "dd", QStringList() << "of=" + deviceNode << "bs=1" << "count=8" << "seek=72");
if (!cmd.start())
return false;
if (cmd.write(reinterpret_cast<char*>(&uuid.data4[0]), 8) != 8)
return false;
return cmd.waitFor(-1);
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool ntfs::updateBootSector(Report& report, const QString& deviceNode) const