commit b920cb44aa5d9defad9479fa460714359095a8d0
author Paul Lawrence <paullawrence@google.com> Thu Oct 04 08:37:17 2018 -0700
committer Paul Lawrence <paullawrence@google.com> Mon Oct 08 14:06:06 2018 -0700
tree 6f1ad977fb7d2d20ee454ede651568c43a549c00
parent 380d3192ccca0f7a4726a19345b56c0f342d4339

Handle retry count correctly

Test: vdc startCheckpoint 2 then reboot 3 times checking state

Change-Id: I4eeda7f73d82a7c8b2469571fa558df2fac47354

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 6a6a8f9..9aaad8f 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -398,6 +398,10 @@
     class_start early_hal
 
 on post-fs-data
+    # Start checkpoint before we touch data
+    start vold
+    exec - system system -- /system/bin/vdc checkpoint prepareCheckpoint
+
     # We chown/chmod /data again so because mount is run as root + defaults
     chown system system /data
     chmod 0771 /data
@@ -405,8 +409,6 @@
     restorecon /data
 
     # Make sure we have the device encryption key.
-    start vold
-    exec - system system -- /system/bin/vdc checkpoint prepareDriveForCheckpoint /data
     installkey /data
 
     # Start bootcharting as soon as possible after the data partition is