support bootloader options

diff --git a/Makefile b/Makefile
index 3a90a57..d82ac33 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# ex: set tabstop=4 noexpandtab: 
 VERSION = $(shell cat VERSION)
 NAME=kickstarter
 TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/")

diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index 6ac2d09..d23e652 100644 (file)
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -20,7 +20,7 @@ rootpw ${metadata.RootPass}
 xconfig --startxonboot
 #end if
 #if $metadata.has_key("Bootloader") 
-bootloader --timeout=${metadata.BootloaderTimeout} --append="${metadata.BootloaderAppend}"
+bootloader --timeout=${metadata.BootloaderTimeout} --append="${metadata.BootloaderAppend}" ${metadata.BootloaderOptions}
 #end if
 #if $metadata.has_key("Desktop")
 desktop --autologinuser=${metadata.DefaultUser}  #slurp

diff --git a/tools/kickstarter b/tools/kickstarter
index 188adc6..f00aec2 100755 (executable)
--- a/tools/kickstarter
+++ b/tools/kickstarter
@@ -1,7 +1,6 @@
 #!/usr/bin/python
 # Anas Nashif <anas.nashif@intel.com>
 import yaml,  sys
-
 import re, os
 from kickstart import kickstart