boot: fix up boot_once support and make it optional v2
Currently we offer the option on a kernel.boot() to request boot_once
semantics. However in fact if you ask for once=False you get the default
boot which is boot_once of autotest, if you ask for once=True you get
two boot_once's one for the tag you wanted and a second for autotest.
In all cases you get boot_once semantics for the autotest tag, not the
semantics you asked for nor the tag you asked for.
This patch removes the redundant once= option for kernel.boot(), it ensures
we pass the required tag to job.reboot(), and finally allows the harness
to select boot_once or set_default mode via boot.set_default.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@745 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/kernel.py b/client/bin/kernel.py
index 48c428e..120725a 100755
--- a/client/bin/kernel.py
+++ b/client/bin/kernel.py
@@ -471,7 +471,7 @@
return release + '::' + version
- def boot(self, args='', once=True, ident=1):
+ def boot(self, args='', ident=1):
""" install and boot this kernel, do not care how
just make it happen.
"""
@@ -492,11 +492,9 @@
# Boot the selected tag.
self.add_to_bootloader(args=args, tag=self.installed_as)
- if once:
- self.job.bootloader.boot_once(self.installed_as)
# Boot it.
- self.job.reboot()
+ self.job.reboot(tag=self.installed_as)
def get_kernel_build_ver(self):