Fix extension storage not working properly

- wrong path to dummy_password
- lack of device for erase

Change-Id: I3d3f43f5b97e0742dca20f30e2a1734f0059bf78

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index f5d4d69..1712c6f 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -49,6 +49,7 @@ SET(DEPENDENCY        klay
 )
 
 SET(SERVER_NAME ${PROJECT_NAME}d)
+SET(PROJECT_DATA_DIR ${DATA_DIR}/${PROJECT_NAME})
 
 ADD_EXECUTABLE(${SERVER_NAME} ${SERVER_SRCS})
 
@@ -60,6 +61,7 @@ TARGET_LINK_LIBRARIES(${SERVER_NAME} ${SERVER_DEPS_LIBRARIES} ${LFS_LDFLAGS} ${L
 
 SET_TARGET_PROPERTIES(${SERVER_NAME} PROPERTIES COMPILE_FLAGS "-fPIE")
 SET_TARGET_PROPERTIES(${SERVER_NAME} PROPERTIES LINK_FLAGS "-pie")
+ADD_DEFINITIONS(-DPROJECT_DATA_DIR="${PROJECT_DATA_DIR}")
 
 TARGET_COMPILE_DEFINITIONS(${SERVER_NAME} PRIVATE
        RUN_PATH="${RUN_DIR}"
@@ -70,4 +72,4 @@ CONFIGURE_FILE(systemd/${PROJECT_NAME}.service.in systemd/${PROJECT_NAME}.servic
 
 INSTALL(TARGETS ${SERVER_NAME} DESTINATION ${BIN_DIR})
 INSTALL(FILES systemd/${PROJECT_NAME}.service DESTINATION ${SYSTEMD_UNIT_DIR})
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/engine/encryption/dummy_password DESTINATION ${DATA_DIR}/${PROJECT_NAME}/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/engine/encryption/dummy_password DESTINATION ${PROJECT_DATA_DIR})

diff --git a/server/engine/encryption/cryptsetup-engine.cpp b/server/engine/encryption/cryptsetup-engine.cpp
index ef7d32b..c8c9fde 100644 (file)
--- a/server/engine/encryption/cryptsetup-engine.cpp
+++ b/server/engine/encryption/cryptsetup-engine.cpp
@@ -122,7 +122,7 @@ void CryptsetupEngine::format(DeviceType type, const data &key)
                        devPath.c_str(),
                        "--key-size=512",
                        "--master-key-file=/dev/stdin",
-                       "--key-file=/usr/share/dummy_password",
+                       "--key-file=" PROJECT_DATA_DIR "/dummy_password",
                        NULL
                };
 
@@ -132,7 +132,8 @@ void CryptsetupEngine::format(DeviceType type, const data &key)
                const char *const argv2[] = {
                        "/usr/sbin/cryptsetup",
                        "-q",
-                       "erase",
+                       "luksErase",
+                       devPath.c_str(),
                        NULL
                };