Force to set mount key

Change-Id: Ie043387998a1067ba30afd695617cd8d0ff46200
Signed-off-by: seolheui, kim <s414.kim@samsung.com>

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index bcf0487..4fdd29d 100644 (file)
--- 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);