diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-03-11 09:14:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-11 09:14:55 +0000 |
| commit | 9fabbbfb03a877e13936b8829e4641cf1b9aebb7 (patch) | |
| tree | 8c841abdeca874a71c665067fde782351ee8113d /fs_mgr | |
| parent | 54352700c706294a404143b641a56462f671b762 (diff) | |
| parent | 86cddf40741024961839dbbcfa005e908314e681 (diff) | |
| download | core-9fabbbfb03a877e13936b8829e4641cf1b9aebb7.tar.gz core-9fabbbfb03a877e13936b8829e4641cf1b9aebb7.tar.bz2 core-9fabbbfb03a877e13936b8829e4641cf1b9aebb7.zip | |
Merge "Do not call libcutils property_set in init through libfs_mgr"
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_verity.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c index c6d914590..feb3c196f 100644 --- a/fs_mgr/fs_mgr_verity.c +++ b/fs_mgr/fs_mgr_verity.c @@ -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) { |