openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr" 

* commit 'fcd14f13a1e05bc1958bfeaba95678b9bf4b121e':
  Do not call libcutils property_set in init through libfs_mgr
This commit is contained in:
Sami Tolvanen 2015-03-11 23:02:32 +00:00 committed by Android Git Automerger
parent 60d5183396 fcd14f13a1
commit bdd7cbd85d
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fs_mgr/fs_mgr_verity.c
View File

@ -381,27 +381,6 @@ static int test_access(char *device) {
return -1;
}
static int set_verified_property(char *name) {
int ret;
char *key;
ret = asprintf(&key, "partition.%s.verified", name);
if (ret < 0) {
ERROR("Error formatting verified property\n");
return ret;
}
ret = PROP_NAME_MAX - strlen(key);
if (ret < 0) {
ERROR("Verified property name is too long\n");
free(key);
return -1;
}
ret = property_set(key, "1");
if (ret < 0)
ERROR("Error setting verified property %s: %d\n", key, ret);
free(key);
return ret;
}
static int check_verity_restart(const char *fname)
{
char buffer[VERITY_KMSG_BUFSIZE + 1];
@ -774,12 +753,7 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab) {
goto out;
}
if (mode == VERITY_MODE_LOGGING) {
retval = FS_MGR_SETUP_VERITY_SUCCESS;
} else {
// set the property indicating that the partition is verified
retval = set_verified_property(mount_point);
}
retval = FS_MGR_SETUP_VERITY_SUCCESS;
out:
if (fd != -1) {