From 9292f74fc1b20275e29246a12ce4913599645cd9 Mon Sep 17 00:00:00 2001
From: Yunkai Lim <yunkai@google.com>
Date: Wed, 26 Jul 2023 06:21:30 +0000
Subject: [PATCH] Revert "init.rc: stop calling 'fsverity_init
 --load-verified-keys'"

Revert submission 2662658-fsverity-init-cleanup

Reason for revert: Culprit for test breakage b/293232766

Reverted changes: /q/submissionid:2662658-fsverity-init-cleanup

Change-Id: I77086f955a53eec274166b7395a88b7dc0e1ad53
---
 rootdir/Android.bp | 5 ++++-
 rootdir/init.rc    | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index 65865a65b..e98733ada 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -20,7 +20,10 @@ prebuilt_etc {
     name: "init.rc",
     src: "init.rc",
     sub_dir: "init/hw",
-    required: ["platform-bootclasspath"],
+    required: [
+        "fsverity_init",
+        "platform-bootclasspath",
+    ],
 }
 
 prebuilt_etc {
diff --git a/rootdir/init.rc b/rootdir/init.rc
index dec763ac1..d2499ef38 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -629,6 +629,9 @@ on late-fs
     # HALs required before storage encryption can get unlocked (FBE)
     class_start early_hal
 
+    # Load trusted keys from dm-verity protected partitions
+    exec -- /system/bin/fsverity_init --load-verified-keys
+
 # Only enable the bootreceiver tracing instance for kernels 5.10 and above.
 on late-fs && property:ro.kernel.version=4.9
     setprop bootreceiver.enable 0