commit 1a043459a93192d52ef03ca730cfafccda1d227d
author Suren Baghdasaryan <surenb@google.com> Mon Apr 22 16:08:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 22 16:08:34 2019 +0000
tree d205e24b5c1ba222dddd8bd340b88171500632dc
parent 1412f3c99de746c13ee35f19df514863b888eeb8
parent 8a315d2a3eb65d39f98f639565f7a29196f5e7bd

Merge "Re-enable file descriptor caching and add option to skip caching"

fs_mgr/fs_mgr_overlayfs.cpp

diff --git a/fs_mgr/fs_mgr_overlayfs.cpp b/fs_mgr/fs_mgr_overlayfs.cpp
index 8984752..e46e497 100644
--- a/fs_mgr/fs_mgr_overlayfs.cpp
+++ b/fs_mgr/fs_mgr_overlayfs.cpp
@@ -636,7 +636,7 @@
         LERROR << mnt_type << " has no mkfs cookbook";
         return false;
     }
-    command += " " + scratch_device;
+    command += " " + scratch_device + " >/dev/null 2>/dev/null </dev/null";
     fs_mgr_set_blk_ro(scratch_device, false);
     auto ret = system(command.c_str());
     if (ret) {

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 9bb624a..295e704 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -608,6 +608,10 @@
     # IOCTLs on ashmem fds any more.
     setprop sys.use_memfd false
 
+    # Set fscklog permission
+    chown root system /dev/fscklogs/log
+    chmod 0770 /dev/fscklogs/log
+
 # It is recommended to put unnecessary data/ initialization from post-fs-data
 # to start-zygote in device's init.rc to unblock zygote start.
 on zygote-start && property:ro.crypto.state=unencrypted