diff options
| author | JP Abgrall <jpa@google.com> | 2014-07-02 13:16:04 -0700 |
|---|---|---|
| committer | JP Abgrall <jpa@google.com> | 2014-07-02 13:39:44 -0700 |
| commit | f22b7452940c99b830749cabdd929f9f7cfdaacc (patch) | |
| tree | 13f98c8609576ffe9116ddfda3ee5955b7f61dbe /fs_mgr/include/fs_mgr.h | |
| parent | 686bce6390db802bfd2cb4e78f9270596b6decb2 (diff) | |
| download | system_core-f22b7452940c99b830749cabdd929f9f7cfdaacc.zip system_core-f22b7452940c99b830749cabdd929f9f7cfdaacc.tar.gz system_core-f22b7452940c99b830749cabdd929f9f7cfdaacc.tar.bz2 | |
fs_mrg: clean up multi-type mount_all
Move the code that attempts to mount alternative fstab entries
into its own function.
Clarify return codes.
Suggest wipe via recovery in error messages.
Bug: 15747366
Change-Id: I3634477cd4d1d73f974f3e906c53285f0d9e0eac
Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'fs_mgr/include/fs_mgr.h')
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index b8bb5aa..ab3f828 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -53,6 +53,10 @@ struct fstab_rec { struct fstab *fs_mgr_read_fstab(const char *fstab_path); void fs_mgr_free_fstab(struct fstab *fstab); + +#define FS_MGR_MNTALL_DEV_NEEDS_ENCRYPTION 2 +#define FS_MGR_MNTALL_DEV_MIGHT_BE_ENCRYPTED 1 +#define FS_MGR_MNTALL_DEV_NOT_ENCRYPTED 0 int fs_mgr_mount_all(struct fstab *fstab); int fs_mgr_do_mount(struct fstab *fstab, char *n_name, char *n_blk_device, char *tmp_mount_point); |