From 2c9c8eb5ffc1012390b6da8614270cc09d392b04 Mon Sep 17 00:00:00 2001 From: Tom Cherry Date: Fri, 16 Oct 2020 10:02:40 -0700 Subject: [PATCH] init.rc: create /data/vendor* earlier A recent change moved creating /data/vendor/tombstone earlier than /data/vendor was created, which would cause /data/vendor/tombstone to not be created until the second time a device boots, instead of the first. This change moves the creation of /data/vendor* earlier, allowing /data/vendor/tombstone to be created on the first boot. Bug: 169659307 Test: boot CF for the first time and see /data/vendor/tombstone is created Change-Id: I53ee8fbc282bc533d50756ebb4cc65a5ca582088 --- rootdir/init.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 7edf3c35e..3146f369e 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -561,6 +561,11 @@ on post-fs-data # Make sure that apexd is started in the default namespace enter_default_mount_ns + mkdir /data/vendor 0771 root root encryption=Require + mkdir /data/vendor_ce 0771 root root encryption=None + mkdir /data/vendor_de 0771 root root encryption=None + mkdir /data/vendor/hardware 0771 root root + # Start tombstoned early to be able to store tombstones. mkdir /data/tombstones 0771 system system encryption=Require mkdir /data/vendor/tombstones 0771 root root @@ -653,11 +658,6 @@ on post-fs-data mkdir /data/preloads 0775 system system encryption=None - mkdir /data/vendor 0771 root root encryption=Require - mkdir /data/vendor_ce 0771 root root encryption=None - mkdir /data/vendor_de 0771 root root encryption=None - mkdir /data/vendor/hardware 0771 root root - # For security reasons, /data/local/tmp should always be empty. # Do not place files or directories in /data/local/tmp mkdir /data/local/tmp 0771 shell shell