openharmony/filemanagement_storage_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_storage_service synced 2024-11-23 06:59:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!587 修改外卡挂载路径为/mnt/data/external

Browse Source 
Merge pull request !587 from 张凯祥/fix_dlp
This commit is contained in:
openharmony_ci 2023-07-24 12:29:32 +00:00 committed by Gitee
commit d6928186c8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/storage_daemon/include/volume/external_volume_info.h
View File

@ -53,7 +53,7 @@ private:
dev_t device_;
const std::string devPathDir_ = "/dev/block/%s";
const std::string mountPathDir_ = "/mnt/external/%s";
const std::string mountPathDir_ = "/mnt/data/external/%s";
std::vector<std::string> supportMountType_ = { "ext2", "ext3", "ext4", "ntfs", "exfat", "vfat" };
std::map<std::string, std::string> supportFormatType_ = {{"exfat", "mkfs.exfat"}, {"vfat", "newfs_msdos"}};

2
services/storage_daemon/storage_daemon.cfg
View File

@ -6,7 +6,7 @@
"mount configfs none /config",
"chown foundation system /config/hmdfs",
"chown foundation system /config/sharefs",
"mkdir /mnt/external 0751 root file_manager"
"mkdir /mnt/data/external 0751 root file_manager"
]
}
],

1
services/storage_daemon/user/src/mount_manager.cpp
View File

@ -60,6 +60,7 @@ MountManager::MountManager()
{"/storage/cloud/%d", 0711, OID_USER_DATA_RW, OID_USER_DATA_RW},
{"/mnt/share/", 0711, OID_ROOT, OID_ROOT},
{"/mnt/share/%d/", 0711, OID_ROOT, OID_ROOT},
{"/mnt/data/%d/", 0711, OID_ROOT, OID_ROOT},
{"/mnt/hmdfs/", 0711, OID_ROOT, OID_ROOT},
{"/mnt/hmdfs/%d/", 0711, OID_ROOT, OID_ROOT},
{"/mnt/hmdfs/%d/account", 0711, OID_ROOT, OID_ROOT},

14
services/storage_daemon/volume/test/volume_info_test.cpp
View File

@ -147,7 +147,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_VolumeInfoTest_Destroy_003, TestSize.Le
ret = mock.Destroy();
EXPECT_TRUE(ret == E_OK);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_VolumeInfoTest_Destroy_003 end";
}
@ -196,7 +196,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_VolumeInfoTest_Mount_002, TestSize.Leve
ret = mock.Mount(mountFlags);
EXPECT_TRUE(ret == E_MOUNT);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_VolumeInfoTest_Mount_002 end";
}
@ -227,7 +227,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_VolumeInfoTest_Mount_003, TestSize.Leve
ret = mock.Mount(mountFlags);
EXPECT_TRUE(ret == E_OK);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_VolumeInfoTest_Mount_003 end";
}
@ -261,7 +261,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_VolumeInfoTest_Mount_004, TestSize.Leve
ret = mock.Mount(mountFlags);
EXPECT_TRUE(ret == E_OK);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_VolumeInfoTest_Mount_004 end";
}
@ -319,7 +319,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_ExternalVolumeInfoTest_UMount_002, Test
ret = mock.UMount(force);
EXPECT_TRUE(ret == E_OK);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_ExternalVolumeInfoTest_UMount_002 end";
}
@ -353,7 +353,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_ExternalVolumeInfoTest_UMount_003, Test
ret = mock.UMount(force);
EXPECT_TRUE(ret == E_OK);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_ExternalVolumeInfoTest_UMount_003 end";
}
@ -388,7 +388,7 @@ HWTEST_F(VolumeInfoTest, Storage_Service_ExternalVolumeInfoTest_UMount_004, Test
ret = mock.UMount(force);
EXPECT_TRUE(ret == E_ERR);
StorageTestUtils::RmDirRecurse("/mnt/external/" + volId);
StorageTestUtils::RmDirRecurse("/mnt/data/external/" + volId);
GTEST_LOG_(INFO) << "Storage_Service_ExternalVolumeInfoTest_UMount_004 end";
}