Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 786b1232 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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

Change-Id: I3e6337c258b3e7fb6eee4ed8e3664a69ae219fd6
parents 149a9b68 42031e0e

fs_mgr/fs_mgr_priv.h

+10 −0
Original line number Diff line number Diff line
@@ -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: