commit 60588af876e124a2f0ae6d5379bdfa029eac950a
author Steven Moreland <smoreland@google.com> Mon Apr 24 21:53:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 24 21:53:22 2023 +0000
tree 563d4577fe6a8d9f6aada3c1e975a3a432db7f43
parent 735320a9d7b72143e48457fa1654310e92c0c75c
parent 7275a19b5fa4db557c7487f686b5bcd1f4eb3361

Merge "envsetup: syswrite - wait after rooting"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 905635c..17d8a5d 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1096,12 +1096,12 @@
 #
 # Easy way to make system.img/etc writable
 function syswrite() {
-  adb wait-for-device && adb root || return 1
+  adb wait-for-device && adb root && adb wait-for-device || return 1
   if [[ $(adb disable-verity | grep -i "reboot") ]]; then
       echo "rebooting"
-      adb reboot && adb wait-for-device && adb root || return 1
+      adb reboot && adb wait-for-device && adb root && adb wait-for-device || return 1
   fi
-  adb wait-for-device && adb remount || return 1
+  adb remount || return 1
 }
 
 # coredump_setup - enable core dumps globally for any process