From 97c2720a625f8ea965e5de8d3a76ab08230a9142 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 21 Mar 2022 07:51:21 +0200 Subject: [PATCH] partitionmanager: NILFS fixes upstream commits: https://github.com/KDE/kpmcore/commit/f7ff5f2d3016a7b04c07d7694d7073ee326f6c9c https://github.com/KDE/kpmcore/commit/29c65783512bcd08a3704a137560872d969f2b7b Signed-off-by: Ivailo Monev --- partitionmanager/src/fs/nilfs2.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/partitionmanager/src/fs/nilfs2.cpp b/partitionmanager/src/fs/nilfs2.cpp index 7994b8bd..40b37aa8 100644 --- a/partitionmanager/src/fs/nilfs2.cpp +++ b/partitionmanager/src/fs/nilfs2.cpp @@ -53,18 +53,18 @@ namespace FS void nilfs2::init() { m_Create = findExternal("mkfs.nilfs2") ? cmdSupportFileSystem : cmdSupportNone; - m_Check = findExternal("fsck.nilfs2") ? cmdSupportFileSystem : cmdSupportNone; + // m_Check = findExternal("fsck.nilfs2") ? cmdSupportFileSystem : cmdSupportNone; m_GetLabel = cmdSupportCore; m_SetLabel = findExternal("nilfs-tune") ? cmdSupportFileSystem : cmdSupportNone; m_UpdateUUID = findExternal("nilfs-tune") ? cmdSupportFileSystem : cmdSupportNone; - m_Grow = (m_Check != cmdSupportNone && findExternal("nilfs-resize")) ? cmdSupportFileSystem : cmdSupportNone; + m_Grow = findExternal("nilfs-resize") ? cmdSupportFileSystem : cmdSupportNone; m_GetUsed = findExternal("nilfs-tune") ? cmdSupportFileSystem : cmdSupportNone; m_Shrink = (m_Grow != cmdSupportNone && m_GetUsed != cmdSupportNone) ? cmdSupportFileSystem : cmdSupportNone; - m_Copy = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; - m_Move = (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; + m_Copy = cmdSupportCore; // (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; + m_Move = cmdSupportCore; // (m_Check != cmdSupportNone) ? cmdSupportCore : cmdSupportNone; m_GetLabel = cmdSupportCore; m_Backup = cmdSupportCore; @@ -78,7 +78,7 @@ namespace FS m_GetLabel != cmdSupportNone && m_SetLabel != cmdSupportNone && m_Create != cmdSupportNone && - m_Check != cmdSupportNone && + // m_Check != cmdSupportNone && m_UpdateUUID != cmdSupportNone && m_Grow != cmdSupportNone && m_Shrink != cmdSupportNone && @@ -90,7 +90,7 @@ namespace FS FileSystem::SupportTool nilfs2::supportToolName() const { - return SupportTool("nilfs2-utils", KUrl("http://code.google.com/p/nilfs2/")); + return SupportTool("nilfs2-utils", KUrl("https://nilfs.osdn.jp/en/")); } qint64 nilfs2::minCapacity() const