From 37e9fd39dee8184ecbf7b55eb52c4919a526298d Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Mon, 5 Jul 2021 20:42:02 +0900 Subject: [PATCH] Support container path when checking "opt/user" is mounted. Change-Id: Ie0c1474258eafcd93634784fed58da74703544ca Signed-off-by: Yunmi Ha --- CMakeLists.txt | 2 +- src/storage-inhouse.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 539311a..1f6875c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ SET(dependents capi-system-info libsyscommon ) -SET(pc_dependents "capi-base-common") +SET(PC_REQUIRED "capi-base-common") INCLUDE(FindPkgConfig) pkg_check_modules(rpkgs REQUIRED ${dependents}) diff --git a/src/storage-inhouse.c b/src/storage-inhouse.c index 1d89af4..45aba82 100755 --- a/src/storage-inhouse.c +++ b/src/storage-inhouse.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "common.h" #include "log.h" @@ -32,6 +33,7 @@ #define FORMAT_TIMEOUT (120*1000) #define USER_PARTITION "user" +#define CONTAINER_USER_PARTITION "contain-user" /* Get compat path from origin Multi-user path @@ -454,10 +456,12 @@ API int storage_is_mounted_opt_usr(storage_part_mount_e *mounted) blkid_dev dev; int ret_val; bool found = false; + char *user_label = is_container()? CONTAINER_USER_PARTITION: USER_PARTITION; if (!mounted) return STORAGE_ERROR_INVALID_PARAMETER; + _D("Find user partition label: %s", user_label); ret_val = blkid_get_cache(&cache, NULL); if (ret_val < 0) { _E("Failed to get cache"); //LCOV_EXCL_LINE @@ -479,12 +483,12 @@ API int storage_is_mounted_opt_usr(storage_part_mount_e *mounted) return STORAGE_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } - ret_val = blkid_dev_set_search(iter, "LABEL", USER_PARTITION); + ret_val = blkid_dev_set_search(iter, "LABEL", user_label); if (blkid_dev_next(iter, &dev) == 0) { dev = blkid_verify(cache, dev); if (dev) { found = true; - _D("Partition for user data is found(LABEL=user)"); + _D("Partition for user data is found(LABEL=%s)", user_label); } } blkid_dev_iterate_end(iter); @@ -497,12 +501,12 @@ API int storage_is_mounted_opt_usr(storage_part_mount_e *mounted) return STORAGE_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } - ret_val = blkid_dev_set_search(iter, "PARTLABEL", USER_PARTITION); + ret_val = blkid_dev_set_search(iter, "PARTLABEL", user_label); if (blkid_dev_next(iter, &dev) == 0) { dev = blkid_verify(cache, dev); if (dev) { found = true; - _D("Partition for user data is found(PARTLABEL=user)"); + _D("Partition for user data is found(PARTLABEL=%s)", user_label); } } blkid_dev_iterate_end(iter); -- 2.7.4