summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2013-04-13 13:23:35 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-04-17 03:59:55 -0700
commit4667b7be11f1ecb9ec77a7bd4eb5cc29fa1d4c5b (patch)
tree162ad8015ba1558ea392d89748f9179749d0e720
parentcfaf7daa2d42f92e77bac626e5ae755e759ae3f4 (diff)
downloadbuild-4667b7be11f1ecb9ec77a7bd4eb5cc29fa1d4c5b.zip
build-4667b7be11f1ecb9ec77a7bd4eb5cc29fa1d4c5b.tar.gz
build-4667b7be11f1ecb9ec77a7bd4eb5cc29fa1d4c5b.tar.bz2
envsetup: Make installboot work in recovery mode too
* Needs a change to adb to allow waiting for recovery Change-Id: Ia90645513f46bcb5f20b7c74c55ef15842710d3d
-rw-r--r--envsetup.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/envsetup.sh b/envsetup.sh
index 2b937f7..2697d89 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1354,9 +1354,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/
@@ -1398,9 +1397,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/