commit 390b77d516e15b7970f54c60157fd65764bc2a0a
author Paul Crowley <paulcrowley@google.com> Fri Aug 16 12:39:17 2019 -0700
committer Paul Crowley <paulcrowley@google.com> Wed Aug 21 10:12:18 2019 -0700
tree 605576c1ccfde29fc47bf009181867f33a8cd948
parent 42bb8d47733fa35c027201e5c5350b588e9a4966

Move layout_version to /data/misc/installd

Bug: 139543295
Test: Boot, ensure file is properly created
Change-Id: I919b5599484b4c77f222e640a1f1b5d65198a0c7

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 4d34b67..b78032d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -532,6 +532,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);
     }