From 98f68446c8d654f0fed1d5d198902a3c76662b05 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Sat, 13 Apr 2013 13:23:35 -0700
Subject: [PATCH] envsetup: Make installboot work in recovery mode too

 * Needs a change to adb to allow waiting for recovery

Change-Id: Ia90645513f46bcb5f20b7c74c55ef15842710d3d
---
 envsetup.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index 3dcc156a0..8df62f7d0 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1702,9 +1702,8 @@ function installboot()
     adb start-server
     adb root
     sleep 1
-    adb wait-for-device
-    adb remount
-    adb wait-for-device
+    adb wait-for-online shell mount /system 2>&1 > /dev/null
+    adb wait-for-online remount
     if (adb shell cat /system/build.prop | grep -q "ro.cm.device=$CM_BUILD");
     then
         adb push $OUT/boot.img /cache/
@@ -1741,9 +1740,8 @@ function installrecovery()
     adb start-server
     adb root
     sleep 1
-    adb wait-for-device
-    adb remount
-    adb wait-for-device
+    adb wait-for-online shell mount /system 2>&1 >> /dev/null
+    adb wait-for-online remount
     if (adb shell cat /system/build.prop | grep -q "ro.cm.device=$CM_BUILD");
     then
         adb push $OUT/recovery.img /cache/
-- 
2.11.0