diff options
| author | Ken Sumrall <ksumrall@android.com> | 2013-02-22 17:36:21 -0800 |
|---|---|---|
| committer | Ken Sumrall <ksumrall@android.com> | 2013-02-22 17:40:58 -0800 |
| commit | 6c2c121386f5e19ed74dc8d706bcb1e6f65fc1ba (patch) | |
| tree | 7dddc18f6c6a066a08ba4e837f04fe24d6d0140c /fs_mgr | |
| parent | 65e203070c0cb25f5401502d60e924ff2b5bdae5 (diff) | |
| download | system_core-6c2c121386f5e19ed74dc8d706bcb1e6f65fc1ba.tar.gz system_core-6c2c121386f5e19ed74dc8d706bcb1e6f65fc1ba.tar.bz2 system_core-6c2c121386f5e19ed74dc8d706bcb1e6f65fc1ba.zip | |
fs_mgr: add support for new recoveryonly flag
If a device has an ext4 partition that contains the radio
firmware, and that filesystem is not mounted in normal
operation, we need a flag to prevent mount_all from
mounting it, so the new flag recoveryonly was added.
Change-Id: I361800c494e751b04c4faf956870f15fd0d8fe20
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr.c | 3 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr_priv.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/fs_mgr/fs_mgr.c b/fs_mgr/fs_mgr.c index fd6f13d16..8f647578b 100644 --- a/fs_mgr/fs_mgr.c +++ b/fs_mgr/fs_mgr.c @@ -75,6 +75,7 @@ static struct flag_list fs_mgr_flags[] = { { "nonremovable",MF_NONREMOVABLE }, { "voldmanaged=",MF_VOLDMANAGED}, { "length=", MF_LENGTH }, + { "recoveryonly",MF_RECOVERYONLY }, { "defaults", 0 }, { 0, 0 }, }; @@ -523,7 +524,7 @@ int fs_mgr_mount_all(struct fstab *fstab) for (i = 0; i < fstab->num_entries; i++) { /* Don't mount entries that are managed by vold */ - if (fstab->recs[i].fs_mgr_flags & MF_VOLDMANAGED) { + if (fstab->recs[i].fs_mgr_flags & (MF_VOLDMANAGED | MF_RECOVERYONLY)) { continue; } diff --git a/fs_mgr/fs_mgr_priv.h b/fs_mgr/fs_mgr_priv.h index 374931bc1..75dad498d 100644 --- a/fs_mgr/fs_mgr_priv.h +++ b/fs_mgr/fs_mgr_priv.h @@ -68,6 +68,7 @@ #define MF_NONREMOVABLE 0x8 #define MF_VOLDMANAGED 0x10 #define MF_LENGTH 0x20 +#define MF_RECOVERYONLY 0x40 #endif /* __CORE_FS_MGR_PRIV_H */ |