diff options
| author | Anas Nashif <nashif@linux.intel.com> | 2011-05-18 18:37:55 +0100 |
|---|---|---|
| committer | Anas Nashif <nashif@linux.intel.com> | 2011-05-18 18:37:55 +0100 |
| commit | 90706529e8d03cea6e44b2ffec464ab99e6ab9c1 (patch) | |
| tree | 86406d344d27d2f4f0a6a2de33fbd66b7f4837b7 | |
| parent | 85173883b3ad780f97dc0158281166c3e012cfcf (diff) | |
| download | kickstarter-90706529e8d03cea6e44b2ffec464ab99e6ab9c1.tar.gz kickstarter-90706529e8d03cea6e44b2ffec464ab99e6ab9c1.tar.bz2 kickstarter-90706529e8d03cea6e44b2ffec464ab99e6ab9c1.zip | |
support bootloader options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | kickstart/kickstart.tmpl | 2 | ||||
| -rwxr-xr-x | tools/kickstarter | 1 |
3 files changed, 1 insertions, 3 deletions
@@ -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 --- 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 --- 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 |