Merge "envsetup: syswrite - wait after rooting"

This commit is contained in:
Steven Moreland
2023-04-24 21:53:22 +00:00
committed by Gerrit Code Review

View File

@@ -1096,12 +1096,12 @@ function qpid() {
# #
# Easy way to make system.img/etc writable # Easy way to make system.img/etc writable
function syswrite() { 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 if [[ $(adb disable-verity | grep -i "reboot") ]]; then
echo "rebooting" 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 fi
adb wait-for-device && adb remount || return 1 adb remount || return 1
} }
# coredump_setup - enable core dumps globally for any process # coredump_setup - enable core dumps globally for any process