From 2cdc902fa4a5df12b6d6bf53b70a355350ba09e1 Mon Sep 17 00:00:00 2001 From: wangminmin Date: Thu, 15 Jun 2023 14:15:02 +0000 Subject: [PATCH 1/3] fix files/Documents UDI&GID Signed-off-by: wangminmin --- services/storage_daemon/user/src/mount_manager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/storage_daemon/user/src/mount_manager.cpp b/services/storage_daemon/user/src/mount_manager.cpp index 7e07604e..34107fb8 100644 --- a/services/storage_daemon/user/src/mount_manager.cpp +++ b/services/storage_daemon/user/src/mount_manager.cpp @@ -46,6 +46,8 @@ MountManager::MountManager() {"/data/service/el2/%d/hmdfs/fuse", 0771, OID_DFS, OID_DFS}, {"/data/service/el2/%d/hmdfs/account", 0711, OID_SYSTEM, OID_SYSTEM}, {"/data/service/el2/%d/hmdfs/account/files", 02771, OID_USER_DATA_RW, OID_USER_DATA_RW}, + {"/data/service/el2/%d/hmdfs/account/files/Documents", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, + {"/data/service/el2/%d/hmdfs/account/files/Download", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, {"/data/service/el2/%d/hmdfs/account/data", 0711, OID_SYSTEM, OID_SYSTEM}, {"/data/service/el2/%d/hmdfs/account/files/Documents", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, {"/data/service/el2/%d/hmdfs/account/files/Download", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, From 31b12f95340456072daf3bcde30cd968ee4fadf8 Mon Sep 17 00:00:00 2001 From: wangminmin Date: Thu, 3 Aug 2023 20:22:21 +0800 Subject: [PATCH 2/3] Revert "fix files/Documents UDI&GID" This reverts commit 9a9f531d6e859052beb74c5fc3b913fbaf6b957f. Signed-off-by: wangminmin --- services/storage_daemon/include/user/mount_manager.h | 1 - services/storage_daemon/user/src/mount_manager.cpp | 2 -- 2 files changed, 3 deletions(-) diff --git a/services/storage_daemon/include/user/mount_manager.h b/services/storage_daemon/include/user/mount_manager.h index b6ff2288..c36f492f 100644 --- a/services/storage_daemon/include/user/mount_manager.h +++ b/services/storage_daemon/include/user/mount_manager.h @@ -33,7 +33,6 @@ struct DirInfo { constexpr uid_t OID_ROOT = 0; constexpr uid_t OID_SYSTEM = 1000; -constexpr uid_t OID_FILE_MANAGER = 1006; constexpr uid_t OID_USER_DATA_RW = 1008; constexpr uid_t OID_DFS = 1009; constexpr uid_t OID_BACKUP = 1089; diff --git a/services/storage_daemon/user/src/mount_manager.cpp b/services/storage_daemon/user/src/mount_manager.cpp index 34107fb8..7e07604e 100644 --- a/services/storage_daemon/user/src/mount_manager.cpp +++ b/services/storage_daemon/user/src/mount_manager.cpp @@ -46,8 +46,6 @@ MountManager::MountManager() {"/data/service/el2/%d/hmdfs/fuse", 0771, OID_DFS, OID_DFS}, {"/data/service/el2/%d/hmdfs/account", 0711, OID_SYSTEM, OID_SYSTEM}, {"/data/service/el2/%d/hmdfs/account/files", 02771, OID_USER_DATA_RW, OID_USER_DATA_RW}, - {"/data/service/el2/%d/hmdfs/account/files/Documents", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, - {"/data/service/el2/%d/hmdfs/account/files/Download", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, {"/data/service/el2/%d/hmdfs/account/data", 0711, OID_SYSTEM, OID_SYSTEM}, {"/data/service/el2/%d/hmdfs/account/files/Documents", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, {"/data/service/el2/%d/hmdfs/account/files/Download", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, From d8fda8ce5eae29cb2e1058051883d8d67ddac8ef Mon Sep 17 00:00:00 2001 From: wangminmin Date: Thu, 3 Aug 2023 20:26:58 +0800 Subject: [PATCH 3/3] add Desktop Doc Signed-off-by: wangminmin --- services/storage_daemon/include/user/mount_manager.h | 1 + services/storage_daemon/user/src/mount_manager.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/services/storage_daemon/include/user/mount_manager.h b/services/storage_daemon/include/user/mount_manager.h index c36f492f..b6ff2288 100644 --- a/services/storage_daemon/include/user/mount_manager.h +++ b/services/storage_daemon/include/user/mount_manager.h @@ -33,6 +33,7 @@ struct DirInfo { constexpr uid_t OID_ROOT = 0; constexpr uid_t OID_SYSTEM = 1000; +constexpr uid_t OID_FILE_MANAGER = 1006; constexpr uid_t OID_USER_DATA_RW = 1008; constexpr uid_t OID_DFS = 1009; constexpr uid_t OID_BACKUP = 1089; diff --git a/services/storage_daemon/user/src/mount_manager.cpp b/services/storage_daemon/user/src/mount_manager.cpp index 7e07604e..13f52ffb 100644 --- a/services/storage_daemon/user/src/mount_manager.cpp +++ b/services/storage_daemon/user/src/mount_manager.cpp @@ -49,6 +49,8 @@ MountManager::MountManager() {"/data/service/el2/%d/hmdfs/account/data", 0711, OID_SYSTEM, OID_SYSTEM}, {"/data/service/el2/%d/hmdfs/account/files/Documents", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, {"/data/service/el2/%d/hmdfs/account/files/Download", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, + {"/data/service/el2/%d/hmdfs/account/files/Desktop", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, + {"/data/service/el2/%d/hmdfs/account/files/Docs", 02771, OID_FILE_MANAGER, OID_FILE_MANAGER}, {"/data/service/el2/%d/hmdfs/non_account", 0711, OID_SYSTEM, OID_SYSTEM}, {"/data/service/el2/%d/hmdfs/non_account/files", 0711, OID_USER_DATA_RW, OID_USER_DATA_RW}, {"/data/service/el2/%d/hmdfs/non_account/data", 0711, OID_SYSTEM, OID_SYSTEM},