commit 00e30155d3c7720bc572694c1b208e719a5db9b9
author Mike Frysinger <vapier@chromium.org> Wed Sep 06 15:51:12 2023 -0400
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Sep 07 02:00:18 2023 +0000
tree 8e57cb6ab1a485028f581caa9b360be1e38b67ee
parent 8db50670e4ffa5b0af87fbf14c81995182c9062d

scripts: deploy_chrome: kill ash after remounting r/w

The common device APIs will remount without killing, so let's align
the deploy_chrome in preparation for switching to the common one.

BUG=b:289176310
TEST=CQ passes

Change-Id: I070dce8a989aa223e6f0ff45143d1330916f1d4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4847273
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index d42f7d6..37a09f9 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -245,12 +245,12 @@
 
         self.device.Reboot()
 
-        # Now that the machine has been rebooted, we need to kill Chrome again.
-        self._KillAshChromeIfNeeded()
-
         # Make sure the rootfs is writable now.
         self._MountRootfsAsWritable(check=True)
 
+        # Now that the machine has been rebooted, we need to kill Chrome again.
+        self._KillAshChromeIfNeeded()
+
         return True
 
     def _CheckUiJobStarted(self):