From 9b1d1fb2e936f23819addb2f39237f93ea7e338f Mon Sep 17 00:00:00 2001 From: "seolheui, kim" Date: Thu, 27 Dec 2018 19:46:00 +0900 Subject: [PATCH] Force to set mount key Change-Id: Ie043387998a1067ba30afd695617cd8d0ff46200 Signed-off-by: seolheui, kim --- server/internal-encryption.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp index bcf0487..4fdd29d 100644 --- a/server/internal-encryption.cpp +++ b/server/internal-encryption.cpp @@ -416,10 +416,9 @@ int InternalEncryptionServer::setMountPassword(const std::string& password) INFO("Upgrade flag detected."); int rc = migrateMasterKey(dev, password); - if (rc == error::None) - UpgradeSupport::removeUpgradeFlag(); - - return rc; + if (rc != error::None) + return rc; + UpgradeSupport::removeUpgradeFlag(); } return keyServer.get(dev, password, mountKey); -- 2.34.1