ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Make sure wait for the dm device" am: d70a5feb60

Browse source 
am: 496e667966

Change-Id: Id3099d46be278ce60db72100adee6c882c216725
This commit is contained in:
Wei Wang 2016-10-26 22:46:29 +00:00 • committed by android-build-merger
commit 8e1a4d6366
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fs_mgr/fs_mgr_verity.cpp
View file

@ -341,6 +341,17 @@ static int resume_verity_table(struct dm_ioctl *io, char *name, int fd)
return 0;
}
static int test_access(char *device) {
int tries = 25;
while (tries--) {
if (!access(device, F_OK) || errno != ENOENT) {
return 0;
}
usleep(40 * 1000);
}
return -1;
}
static int check_verity_restart(const char *fname)
{
char buffer[VERITY_KMSG_BUFSIZE + 1];
@ -1031,6 +1042,11 @@ loaded:
fstab->blk_device = verity_blk_name;
verity_blk_name = 0;
// make sure we've set everything up properly
if (test_access(fstab->blk_device) < 0) {
goto out;
}
retval = FS_MGR_SETUP_VERITY_SUCCESS;
out: