ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '9fabbbfb03a877e13936b8829e4641cf1b9aebb7':
  Do not call libcutils property_set in init through libfs_mgr
This commit is contained in:
Sami Tolvanen 2015-03-11 09:27:15 +00:00 • committed by Android Git Automerger
commit fcd14f13a1
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; 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) static int check_verity_restart(const char *fname)
{ {
char buffer[VERITY_KMSG_BUFSIZE + 1]; char buffer[VERITY_KMSG_BUFSIZE + 1];
@ -774,12 +753,7 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab) {
goto out; goto out;
} }
if (mode == VERITY_MODE_LOGGING) { retval = FS_MGR_SETUP_VERITY_SUCCESS;
retval = FS_MGR_SETUP_VERITY_SUCCESS;
} else {
// set the property indicating that the partition is verified
retval = set_verified_property(mount_point);
}
out: out:
if (fd != -1) { if (fd != -1) {