tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 786b1232: resolved conflicts for merge of 42031e0e to stage-aosp-master

Browse source 
* commit '786b1232d201d46f59bd9da84bfcfcb9ad80bb6c':
  fs_mgr_priv: Extend fs wait timeout to 20 seconds
This commit is contained in:
Elliott Hughes 2013-07-11 18:50:25 -07:00 committed by Android Git Automerger
commit dccd777307
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs_mgr/fs_mgr_priv.h
View file

@ -25,6 +25,16 @@
#define CRYPTO_TMPFS_OPTIONS "size=128m,mode=0771,uid=1000,gid=1000"
struct fstab_rec {
char *blk_dev;
char *mnt_point;
char *type;
unsigned long flags;
char *fs_options;
int fs_mgr_flags;
char *key_loc;
};
#define WAIT_TIMEOUT 5
/* fstab has the following format: