commit d60030f8820955e262ec6e932b3c8dcd1dd9cf3c
author ctchang <ctchang@chromium.org> Wed Aug 29 15:39:56 2012 +0800
committer Gerrit <chrome-bot@google.com> Thu Sep 13 02:40:24 2012 -0700
tree 7f4904d3acd1983905e34b84e9393550f2fad77e
parent 6c1dc15e8ef2229f97091fc17b01a21b993e6cd1

Recovery kernel by modifying kernel directly

Two test are involved: firmware_CorruptBothKernelAB and
firmware_RollbackKernel. Improve recovery step from using command
chromeos-install to directly modifying kernel. This may save many
times.

BUG=chrome-os-partner:13323
CQ-DEPEND=31692
TEST=.run_remote_tests.sh --remote="172.30.210.85" --board=link --servo
    firmware_RollbackKernel/control$ (or firmware_CorruptBothKernelAB)

Change-Id: I66819a0ed77d20f313f1407ddf14229f29085a6e
Reviewed-on: https://gerrit.chromium.org/gerrit/31693
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>

client/cros/faft_client.py

diff --git a/client/cros/faft_client.py b/client/cros/faft_client.py
index f02fc3a..8419a58 100644
--- a/client/cros/faft_client.py
+++ b/client/cros/faft_client.py
@@ -102,11 +102,13 @@
         # order not to break the old image and still be able to run.
         try:
             self._kernel_handler.init(self._chromeos_interface,
-                                      dev_key_path='/usr/share/vboot/devkeys')
+                                      dev_key_path='/usr/share/vboot/devkeys',
+                                      internal_disk=True)
         except:
             # Copy the key to the current working directory.
             shutil.copy('/usr/share/vboot/devkeys/kernel_data_key.vbprivk', '.')
-            self._kernel_handler.init(self._chromeos_interface)
+            self._kernel_handler.init(self._chromeos_interface,
+                                      internal_disk=True)
 
         self._tpm_handler = tpm_handler.TpmHandler()
         self._tpm_handler.init(self._chromeos_interface)