From a7c9acd5184ede1d9446419d87a427dbe212e4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 11 May 2016 11:53:15 +0100 Subject: [PATCH] Move luks label handlingfrom libpartedbackend to FS::luks. --- src/fs/luks.cpp | 2 +- src/plugins/libparted/libpartedbackend.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index 9b8f8ed..d36a286 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -69,7 +69,7 @@ luks::~luks() void luks::init() { m_Create = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone; - m_SetLabel = cmdSupportFileSystem; + m_SetLabel = cmdSupportNone; m_GetLabel = cmdSupportFileSystem; m_UpdateUUID = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone; m_Grow = findExternal(QStringLiteral("cryptsetup")) ? cmdSupportFileSystem : cmdSupportNone; diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp index 3ecf877..eae3865 100644 --- a/src/plugins/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -379,7 +379,6 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk) // in helpers.h for convenience. mounted = isMounted(mapperNode); } else { - luksFs->m_SetLabel = FileSystem::cmdSupportNone; mounted = false; }