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

am 66083ae8: Merge "sdcard: ensure installd fs upgrade has completed"

Browse source 
* commit '66083ae834374074047f0eff41e80999660d4af1':
  sdcard: ensure installd fs upgrade has completed
This commit is contained in:
Nick Kralevich 2014-07-25 18:32:29 +00:00 • committed by Android Git Automerger
commit 1a423b2ee7
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sdcard/sdcard.c
View file

@ -1850,6 +1850,7 @@ int main(int argc, char **argv)
bool split_perms = false;
int i;
struct rlimit rlim;
int fs_version;
int opt;
while ((opt = getopt(argc, argv, "u:g:w:t:dls")) != -1) {
@ -1924,6 +1925,11 @@ int main(int argc, char **argv)
ERROR("Error setting RLIMIT_NOFILE, errno = %d\n", errno);
}
while ((fs_read_atomic_int("/data/.layout_version", &fs_version) == -1) || (fs_version < 3)) {
ERROR("installd fs upgrade not yet complete. Waiting...\n");
sleep(1);
}
res = run(source_path, dest_path, uid, gid, write_gid, num_threads, derive, split_perms);
return res < 0 ? 1 : 0;
}