From f22b7452940c99b830749cabdd929f9f7cfdaacc Mon Sep 17 00:00:00 2001 From: JP Abgrall Date: Wed, 2 Jul 2014 13:16:04 -0700 Subject: 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 --- fs_mgr/include/fs_mgr.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'fs_mgr/include/fs_mgr.h') 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); -- cgit v1.1