diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-03-26 16:27:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 16:27:46 +0000 |
| commit | b042a2e8bdb932d13fd2684d90cf92db09b6039f (patch) | |
| tree | c943f8fb1ea83f9d70dbf1f3a702a7b48c048206 /fs_mgr/fs_mgr_fstab.c | |
| parent | 0f0db60837cdfbcd659f96ef44dd1ed69c204629 (diff) | |
| parent | c28e2598af394834dbf6532f1cf252705fabd76b (diff) | |
| download | system_core-b042a2e8bdb932d13fd2684d90cf92db09b6039f.tar.gz system_core-b042a2e8bdb932d13fd2684d90cf92db09b6039f.tar.bz2 system_core-b042a2e8bdb932d13fd2684d90cf92db09b6039f.zip | |
am c28e2598: am 3fdc2f2b: am d33c6c0e: Merge "Use structured format for verity metadata"
* commit 'c28e2598af394834dbf6532f1cf252705fabd76b':
Use structured format for verity metadata
Diffstat (limited to 'fs_mgr/fs_mgr_fstab.c')
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c index 64f7edc9c..97cf8112a 100644 --- a/fs_mgr/fs_mgr_fstab.c +++ b/fs_mgr/fs_mgr_fstab.c @@ -24,6 +24,7 @@ struct fs_mgr_flag_values { char *key_loc; + char *verity_loc; long long part_length; char *label; int partnum; @@ -108,6 +109,14 @@ static int parse_flags(char *flags, struct flag_list *fl, * location of the keys. Get it and return it. */ flag_vals->key_loc = strdup(strchr(p, '=') + 1); + } else if ((fl[i].flag == MF_VERIFY) && flag_vals) { + /* If the verify flag is followed by an = and the + * location for the verity state, get it and return it. + */ + char *start = strchr(p, '='); + if (start) { + flag_vals->verity_loc = strdup(start + 1); + } } else if ((fl[i].flag == MF_FORCECRYPT) && flag_vals) { /* The forceencrypt flag is followed by an = and the * location of the keys. Get it and return it. @@ -292,6 +301,7 @@ struct fstab *fs_mgr_read_fstab(const char *fstab_path) fstab->recs[cnt].fs_mgr_flags = parse_flags(p, fs_mgr_flags, &flag_vals, NULL, 0); fstab->recs[cnt].key_loc = flag_vals.key_loc; + fstab->recs[cnt].verity_loc = flag_vals.verity_loc; fstab->recs[cnt].length = flag_vals.part_length; fstab->recs[cnt].label = flag_vals.label; fstab->recs[cnt].partnum = flag_vals.partnum; |