According to own TODO comment previously found for the method, it doesn't make sense to boot once using the default kernel. So, turn it into an explicit no-op.
Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> --- client/common_lib/boottool.py | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/client/common_lib/boottool.py b/client/common_lib/boottool.py index 1c29861..f123f1c 100644 --- a/client/common_lib/boottool.py +++ b/client/common_lib/boottool.py @@ -264,18 +264,14 @@ class boottool(object): def boot_once(self, title=None): """ - Sets a specific entry for the next boot Then falls back to the + Sets a specific entry for the next boot, then falls back to the default kernel. @param kernel: title that identifies the entry to set for booting. If - evaluates to false it will use the default entry title. - (FIXME: that does not make much sense, if an entry is default - by definition that means it boots next anyways so maybe it - should be a NOP for title evaluating to False) - """ - if not title: - title = self.get_default_title() - self._run_boottool('--boot-once', '--title=%s' % title) + evaluates to false, this becomes a no-op. + """ + if title: + self._run_boottool('--boot-once', '--title=%s' % title) def enable_xen_mode(self): -- 1.7.2.3 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
