openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

resolved conflicts for merge of 42031e0e to stage-aosp-master 

Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
This commit is contained in:
Elliott Hughes 2013-07-11 18:48:30 -07:00
parent 149a9b68ab 42031e0ed7
commit 786b1232d2
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: