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

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

Browse source 
am: 24f955155a

Change-Id: Icf3e304aff7e4e1e556c6372be932e3c357d1bbe
This commit is contained in:
Paul Crowley 2019-08-28 13:35:54 -07:00 • committed by android-build-merger
commit 95e7252fd8
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rootdir/init.rc
View file

@ -532,6 +532,7 @@ on post-fs-data
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

3
sdcard/sdcard.cpp
View file

@ -315,7 +315,8 @@ int main(int argc, char **argv) {
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);
}