summaryrefslogtreecommitdiffstats
path: root/envsetup.sh
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-08-09 21:03:42 -0700
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:12:23 -0700
commit75f1076dba6ac26ea3bab0b1c95feac72dc4c502 (patch)
treef7352e70d4346169b9bfe6e3a3221fb78ff45366 /envsetup.sh
parent9e4c4a783b62108956269bc2291e35e4d64c054a (diff)
downloadbuild-75f1076dba6ac26ea3bab0b1c95feac72dc4c502.zip
build-75f1076dba6ac26ea3bab0b1c95feac72dc4c502.tar.gz
build-75f1076dba6ac26ea3bab0b1c95feac72dc4c502.tar.bz2
envsetup: Fix installrecovery for new fstab format
Change-Id: I26ab441c28350cce70bb976b249b16c6b83ab8da
Diffstat (limited to 'envsetup.sh')
-rw-r--r--envsetup.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 4a47617..17fb43c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1661,8 +1661,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:]]\/boot[[:space:]]" $OUT/recovery/root/etc/recovery.fstab | awk {'print $1'}`
+ PARTITION_TYPE=`grep "[[:space:]]\/boot[[: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