kernel: add boot.default_args from the job configuration
Allow the job configuration override the default boot args
for this machine.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@395 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/kernel.py b/client/bin/kernel.py
index 437fb15..37de9eb 100755
--- a/client/bin/kernel.py
+++ b/client/bin/kernel.py
@@ -299,9 +299,13 @@
# add_kernel(image, title='autotest', inird='')
self.job.bootloader.add_kernel(self.image, tag, self.initrd)
- # if no args passed, populate from /proc/cmdline
- if not args:
- args = open('/proc/cmdline', 'r').readline().strip()
+ # pull the base argument set from the job config,
+ # otherwise populate from /proc/cmdline
+ baseargs = self.job.config_get('boot.default_args')
+ if not baseargs:
+ baseargs = open('/proc/cmdline', 'r').readline().strip()
+
+ args = baseargs + " " + args
# add args to entry one at a time
for a in args.split(' '):