Continue operation if /opt/usr is not mounted

Also skip ENXIO error when device mapper entry is being removed

Change-Id: I339b43ae73ce68928abe8453021add42061cd18e

diff --git a/server/engine/encryption/dmcrypt-engine.cpp b/server/engine/encryption/dmcrypt-engine.cpp
index 7c4d16d..0820e49 100644 (file)
--- a/server/engine/encryption/dmcrypt-engine.cpp
+++ b/server/engine/encryption/dmcrypt-engine.cpp
@@ -19,6 +19,7 @@
 #include <sys/mount.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 #include <klay/audit/logger.h>
 
@@ -186,9 +187,10 @@ void destroyCryptoBlkDev(const std::string &cryptoBlkDev)
 
        initDMIoctl(buf, sizeof(buf), cryptoBlkDev, 0);
        ret = ioctl(fd, DM_DEV_REMOVE, buf);
+       int err = errno;
        close(fd);
 
-       if (ret != 0) {
+       if (ret != 0 && err != ENXIO) {
                throw runtime::Exception("Cannot remove dm-crypt device");
        }
 }
@@ -252,7 +254,7 @@ void DMCryptEngine::mount(const DMCryptEngine::data &key, unsigned int options)
 
 void DMCryptEngine::umount()
 {
-       if (::umount(destination.c_str()))
+       if (::umount(destination.c_str()) && errno != EINVAL)
                throw runtime::Exception(runtime::GetSystemErrorMessage());
 
        destroyCryptoBlkDev(DM_DEFAULT_LABEL_NAME);