From 27fc7b2c2dd450d69e16570a074de34365033a72 Mon Sep 17 00:00:00 2001
From: Mike McTernan <mikemcternan@google.com>
Date: Thu, 8 Sep 2022 14:03:18 +0100
Subject: [PATCH] Start storageproxyd earlier, but after /dev/sg1 has arrived.

Background:
* Sometimes /dev/sg1 isn't ready when storageproxy attempts to start.
  Add a trigger to wait for the device.

Bug: 245194332
Bug: 245724566
Test: manual
Change-Id: I23300b7f1a0170dc1b73c5e3b5b2c7e2b1ecba2b
---
 conf/init.zuma.rc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index 1b17b4ac..2dfd8b12 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -318,6 +318,11 @@ on init
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200
     write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200
 
+on post-fs
+    # Ensure device is ready and start storageproxyd
+    wait /dev/sg1
+    start storageproxyd
+
 on late-fs
     # Wait for keymaster HALs
     exec_start wait_for_keymaster