Hot Fix to internal storage decryption

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

diff --git a/server/engine/encryption/dmcrypt-engine.cpp b/server/engine/encryption/dmcrypt-engine.cpp
index 838816a..1e2d920 100644 (file)
--- a/server/engine/encryption/dmcrypt-engine.cpp
+++ b/server/engine/encryption/dmcrypt-engine.cpp
@@ -286,6 +286,9 @@ void DMCryptEngine::mount(const BinaryData &key, unsigned int options)
 
 void DMCryptEngine::umount()
 {
+       if (::umount("/opt/usr/apps") && errno != EINVAL)
+               throw runtime::Exception(runtime::GetSystemErrorMessage());
+
        if (::umount(destination.c_str()) && errno != EINVAL)
                throw runtime::Exception(runtime::GetSystemErrorMessage());
 

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index ed5b6fc..e5f77ce 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -157,12 +157,14 @@ void stopKnownSystemdUnits()
                }
 
                std::string unit(dataStr[0]);
-               if (unit == "security-manager.socket") {
+               if (unit == "security-manager.socket" ||
+                               unit == "connman.socket") {
                        knownSystemdUnits.insert(knownSystemdUnits.begin(), unit);
                } else if (unit.compare(0, 5, "user@") == 0 ||
                        unit == "tlm.service" ||
                        unit == "resourced.service" ||
-                       unit == "security-manager.service") {
+                       unit == "security-manager.service" ||
+                       unit == "samsung-log-mgr.service") {
                        knownSystemdUnits.push_back(unit);
                }
        }