Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24f95515 authored by Paul Crowley's avatar Paul Crowley Committed by Gerrit Code Review
Browse files

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

parents 956c204f 26aabfd1

rootdir/init.rc

+1 −0
Original line number Original line Diff line number Diff line
@@ -536,6 +536,7 @@ on post-fs-data 
    mkdir /data/misc/profiles/ref 0771 system system

    mkdir /data/misc/profiles/ref 0771 system system

    mkdir /data/misc/profman 0770 system shell

    mkdir /data/misc/profman 0770 system shell

    mkdir /data/misc/gcov 0770 root root

    mkdir /data/misc/gcov 0770 root root

    mkdir /data/misc/installd 0700 root root





    mkdir /data/preloads 0775 system system

    mkdir /data/preloads 0775 system system

sdcard/sdcard.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -315,7 +315,8 @@ int main(int argc, char **argv) { 
        PLOG(ERROR) << "setting RLIMIT_NOFILE failed";

        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...";

        LOG(ERROR) << "installd fs upgrade not yet complete; waiting...";

        sleep(1);

        sleep(1);

    }

    }