From 968521a5c4fb01c44b397bf7cb47c76282472243 Mon Sep 17 00:00:00 2001
From: Wei Wang <wvw@google.com>
Date: Mon, 18 Jun 2018 23:20:00 -0400
Subject: [PATCH] sanders: start bootanim before mounting data partition

Bug: 30118894

Signed off by: Nolen Johnson <johnsonnolen@gmail.com>

Change-Id: If84764e3ce51f467b2dfa867ce28e1e396422d45
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
---
 rootdir/etc/fstab.qcom   |  2 +-
 rootdir/etc/init.qcom.rc | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom
index 4e8a72c..8a45f92 100644
--- a/rootdir/etc/fstab.qcom
+++ b/rootdir/etc/fstab.qcom
@@ -7,7 +7,7 @@
 
 #<src>                                      <mnt_point>              <type>  <mnt_flags and options>                                                            <fs_mgr_flags>
 # /dev/block/bootdevice/by-name/system         /system                ext4    ro,barrier=1,discard                                                               wait
-/dev/block/bootdevice/by-name/userdata       /data                   f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data      wait,check,formattable,encryptable=/dev/block/bootdevice/by-name/metadata,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata       /data                   f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,nobarrier,inline_xattr,inline_data      wait,check,latemount,formattable,encryptable=/dev/block/bootdevice/by-name/metadata,reservedsize=128M
 /dev/block/bootdevice/by-name/cache          /cache                  ext4    rw,noatime,nosuid,nodev,barrier=1,data=ordered                                     wait,check,formattable
 /dev/block/bootdevice/by-name/modem          /vendor/firmware_mnt    ext4    ro,nosuid,nodev,barrier=0                                                          wait
 /dev/block/bootdevice/by-name/fsg            /fsg                    ext4    ro,nosuid,nodev                                                                    wait
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 6324288..fd4f9d1 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -45,9 +45,17 @@ on fs
     wait /dev/block/platform/soc/${ro.boot.bootdevice}
     symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
 
-    mount_all /vendor/etc/fstab.qcom
+    mount_all /vendor/etc/fstab.qcom --early
     write /proc/sys/vm/swappiness 100
 
+on late-fs
+    # Start services for bootanim
+    start servicemanager
+    start surfaceflinger
+    start bootanim
+    # mount RW partitions which need run fsck
+    mount_all /vendor/etc/fstab.qcom --late
+
     chown root system /mnt/vendor/persist
     chmod 0771 /mnt/vendor/persist
     mkdir /mnt/vendor/persist/data 0700 system system