Merged the contents of client.bin.boottool and server.hosts.Bootloader
into a common_lib.boottool API. Added unittest for it. Updated users.
Visibility: this changes the client and server job.bootloader API
slightly and while I've tried to make sure that all users of the old
API are updated to the new one it's possible that there is code ouside
the Autotest source tree that may rely on the old API.
Signed-off-by: Mihai Rusu <dizzy@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3785 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/hosts/remote.py b/server/hosts/remote.py
index 967b648..4fc6911 100644
--- a/server/hosts/remote.py
+++ b/server/hosts/remote.py
@@ -118,10 +118,8 @@
self.reboot_setup(label=label, kernel_args=kernel_args, **dargs)
if label or kernel_args:
- self.bootloader.install_boottool()
if not label:
- default = int(self.bootloader.get_default())
- label = self.bootloader.get_titles()[default]
+ label = self.bootloader.get_default_title()
self.bootloader.boot_once(label)
if kernel_args:
self.bootloader.add_args(label, kernel_args)