commit 24f955155ab32c0e260fddc02c98342525be7653
author Paul Crowley <paulcrowley@google.com> Wed Aug 28 19:56:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 28 19:56:15 2019 +0000
tree 2a5ad68f40af29ba5cd13b0c7b2d1ea6253a1fc3
parent 956c204f1e0fa1bcb246ec776f5551f12e23d971
parent 26aabfd1ed6a7afcc70692a3fb7f1c66e2f209e2

Merge "Move layout_version to /data/misc/installd"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0f61a61..97f1854 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -536,6 +536,7 @@
     mkdir /data/misc/profiles/ref 0771 system system
     mkdir /data/misc/profman 0770 system shell
     mkdir /data/misc/gcov 0770 root root
+    mkdir /data/misc/installd 0700 root root
 
     mkdir /data/preloads 0775 system system
 

sdcard/sdcard.cpp

diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp
index 2b35819..622de5b 100644
--- a/sdcard/sdcard.cpp
+++ b/sdcard/sdcard.cpp
@@ -315,7 +315,8 @@
         PLOG(ERROR) << "setting RLIMIT_NOFILE failed";
     }
 
-    while ((fs_read_atomic_int("/data/.layout_version", &fs_version) == -1) || (fs_version < 3)) {
+    while ((fs_read_atomic_int("/data/misc/installd/layout_version", &fs_version) == -1) ||
+           (fs_version < 3)) {
         LOG(ERROR) << "installd fs upgrade not yet complete; waiting...";
         sleep(1);
     }