From 4e1830c03606973781f2ca2cd6df66e46b6941aa Mon Sep 17 00:00:00 2001 From: Jaemin Ryu Date: Wed, 4 Jul 2018 13:49:02 +0900 Subject: [PATCH] Add metafile backup script for softreset Change-Id: I3cb3398b1bebdc928235e81ecd9113ca7c666948 Signed-off-by: Jaemin Ryu --- CMakeLists.txt | 4 ++++ fota/CMakeLists.txt | 1 + fota/ode_softreset.sh | 15 +++++++++++++++ packaging/ode.spec | 3 +++ 4 files changed, 23 insertions(+) create mode 100755 fota/ode_softreset.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a6e621..620abf2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,6 +92,10 @@ IF(NOT DEFINED SYSTEMD_UNIT_DIR) SET(SYSTEMD_UNIT_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system") ENDIF(NOT DEFINED SYSTEMD_UNIT_DIR) +IF(NOT DEFINED SOFTRESET_DIR) + SET(SOFTRESET_DIR "/usr/system/RestoreDir/softreset") +ENDIF(NOT DEFINED SOFTRESET_DIR) + IF(NOT DEFINED KEY_STORAGE_PLUGIN_DIR) SET(KEY_STORAGE_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/ode-key-storage-plugin") ENDIF(NOT DEFINED KEY_STORAGE_PLUGIN_DIR) diff --git a/fota/CMakeLists.txt b/fota/CMakeLists.txt index af7098f..a23685b 100755 --- a/fota/CMakeLists.txt +++ b/fota/CMakeLists.txt @@ -39,3 +39,4 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIE") SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-pie") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${SBIN_DIR}) +INSTALL(FILES ode_softreset.sh DESTINATION ${SOFTRESET_DIR}) diff --git a/fota/ode_softreset.sh b/fota/ode_softreset.sh new file mode 100755 index 0000000..f81b902 --- /dev/null +++ b/fota/ode_softreset.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# ode footer and key tokens +METAFILE=`ls /opt/etc/.ode_*` + +# vconf keys required by ode +VCONFKEYS="db/ode/crypto_blkdev db/ode/crypto_state db/ode/crypto_type db/ode/encrypt_progress db/ode/fast_encryption" + +for file in $METAFILE; do +/usr/bin/pkg -k $file +done + +for key in $VCONFKEYS; do +/usr/bin/pkg -v $key +done diff --git a/packaging/ode.spec b/packaging/ode.spec index ab1305d..8f05da7 100755 --- a/packaging/ode.spec +++ b/packaging/ode.spec @@ -22,6 +22,7 @@ BuildRequires: pkgconfig(blkid) Requires: cryptsetup %global key_storage_plugin_dir %{_libdir}/ode-key-storage-plugin/ +%global softreset_dir /usr/system/RestoreDir/softreset/ %description The ode package provides a daemon which is responsible for encrypting/decryption storages and secure erasing. @@ -33,6 +34,7 @@ The ode package provides a daemon which is responsible for encrypting/decryption %{_unitdir}/ode.service %{_unitdir}/multi-user.target.wants/ode.service %attr(700,root,root) %{TZ_SYS_SBIN}/ode-admin-cli +%attr(700,root,root) %{softreset_dir}/ode_softreset.sh %attr(750,root,system_share) %{TZ_SYS_SBIN}/ode-fota %{_datadir}/%{name} %dir %{key_storage_plugin_dir} @@ -56,6 +58,7 @@ The ode package provides a daemon which is responsible for encrypting/decryption -DSYSTEMD_UNIT_DIR=%{_unitdir} \ -DAPP_INSTALL_PREFIX="%{TZ_SYS_RO_APP}" \ -DAPP_SHARE_PACKAGES_DIR="%{TZ_SYS_RO_PACKAGES}" \ + -DSOFTRESET_DIR="%{softreset_dir}" \ -DKEY_STORAGE_PLUGIN_DIR="%{key_storage_plugin_dir}" make %{?jobs:-j%jobs} -- 2.7.4