From 8afe33a4a4101c853afba53efb381a3133de3506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 3 Dec 2017 16:28:16 +0000 Subject: [PATCH 1/2] Allow setting label for inner LUKS file system during the initial creation. --- src/fs/luks.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/fs/luks.h b/src/fs/luks.h index 737c5f1..0e414a3 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -113,8 +113,6 @@ public: return m_Backup; } CommandSupportType supportSetLabel() const override { - if (!m_isCryptOpen) - return cmdSupportNone; if (m_Check && m_innerFs) return m_innerFs->supportSetLabel(); return cmdSupportNone; From e66fb4b95e4449f3ac3ef27a37daba0d8537ea12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Wed, 6 Dec 2017 00:27:02 +0000 Subject: [PATCH 2/2] Do not attempt to set partition flags that were not changed. --- src/jobs/setpartflagsjob.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/jobs/setpartflagsjob.cpp b/src/jobs/setpartflagsjob.cpp index 6f8417a..47ce78d 100644 --- a/src/jobs/setpartflagsjob.cpp +++ b/src/jobs/setpartflagsjob.cpp @@ -73,7 +73,10 @@ bool SetPartFlagsJob::run(Report& parent) for (const auto &f : PartitionTable::flagList()) { emit progress(++count); + const bool oldState = (partition().activeFlags() & f) ? true : false; const bool state = (flags() & f) ? true : false; + if (oldState == state) + continue; if (!backendPartition->setFlag(*report, f, state)) { report->line() << xi18nc("@info:progress", "There was an error setting flag %1 for partition %2 to state %3.", PartitionTable::flagName(f), partition().deviceNode(), state ? xi18nc("@info:progress flag turned on, active", "on") : xi18nc("@info:progress flag turned off, inactive", "off"));