summaryrefslogtreecommitdiffstats
path: root/fs_mgr/include
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-06-18 14:54:37 -0700
committerJP Abgrall <jpa@google.com>2014-06-18 22:18:24 +0000
commit5c01dac6d81a804dcff233da777882bec852f25b (patch)
tree811fb71c4ea0e690b09e8303688883a2b3dcbdea /fs_mgr/include
parent64c0ff21e484331bcd796284bc16160ab04f53e2 (diff)
downloadsystem_core-5c01dac6d81a804dcff233da777882bec852f25b.zip
system_core-5c01dac6d81a804dcff233da777882bec852f25b.tar.gz
system_core-5c01dac6d81a804dcff233da777882bec852f25b.tar.bz2
fsmgr: support multiple fs-types/mountpoint
Previous attempt was broken. It would incorrectly be affected by mount failures. This changes allows an fstab to contain multiple lines for a given mount point. The lines sharing a mount MUST be after each other. The 1st matching line is the primary when it comes to mounting and look ups for wiping. Mounting based on a mount_point will attempt each dup in turn until one succeeds. The reported error will be that of the last failed attempt. This is to allow quick experimentation between different FSes. Bug: 15702546 Change-Id: I378d68ad13eb0098ec1ccb8dcf108b82acbe9ebb Signed-off-by: JP Abgrall <jpa@google.com>
Diffstat (limited to 'fs_mgr/include')
-rw-r--r--fs_mgr/include/fs_mgr.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h
index 835cf64..b8bb5aa 100644
--- a/fs_mgr/include/fs_mgr.h
+++ b/fs_mgr/include/fs_mgr.h
@@ -24,6 +24,11 @@
extern "C" {
#endif
+/*
+ * The entries must be kept in the same order as they were seen in the fstab.
+ * Unless explicitly requested, a lookup on mount point should always
+ * return the 1st one.
+ */
struct fstab {
int num_entries;
struct fstab_rec *recs;