From 597683b6a5ca69963dcd77eb36c383ce36301c06 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Fri, 9 Aug 2013 21:03:42 -0700
Subject: [PATCH] envsetup: Fix installrecovery for new fstab format

Change-Id: I26ab441c28350cce70bb976b249b16c6b83ab8da

envsetup: Fix giant derp

Change-Id: I490556f18c40c3614e4e554d7db3306a16ff99d8
---
 envsetup.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/envsetup.sh b/envsetup.sh
index 13164f032..b62371bb3 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1753,8 +1753,14 @@ function installrecovery()
     PARTITION=`grep "^\/recovery" $OUT/recovery/root/etc/recovery.fstab | awk {'print $3'}`
     if [ -z "$PARTITION" ];
     then
-        echo "Unable to determine recovery partition."
-        return 1
+        # Try for RECOVERY_FSTAB_VERSION = 2
+        PARTITION=`grep "[[:space:]]\/recovery[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $1'}`
+        PARTITION_TYPE=`grep "[[:space:]]\/recovery[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $3'}`
+        if [ -z "$PARTITION" ];
+        then
+            echo "Unable to determine recovery partition."
+            return 1
+        fi
     fi
     adb start-server
     adb root
-- 
2.11.0