diff options
| author | Anas Nashif <nashif@linux.intel.com> | 2011-05-27 16:13:42 -0700 |
|---|---|---|
| committer | Anas Nashif <nashif@linux.intel.com> | 2011-05-27 16:13:42 -0700 |
| commit | df91740e94d367b7a86560bae83a525f26276626 (patch) | |
| tree | e1e876d42bc20148a457c275f17b6bbcf2b806ac | |
| parent | 90706529e8d03cea6e44b2ffec464ab99e6ab9c1 (diff) | |
| download | kickstarter-df91740e94d367b7a86560bae83a525f26276626.tar.gz kickstarter-df91740e94d367b7a86560bae83a525f26276626.tar.bz2 kickstarter-df91740e94d367b7a86560bae83a525f26276626.zip | |
better support bootloader options
| -rw-r--r-- | configurations.yaml | 1 | ||||
| -rw-r--r-- | kickstart/kickstart.tmpl | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/configurations.yaml b/configurations.yaml index 30936c6..724ebd6 100644 --- a/configurations.yaml +++ b/configurations.yaml @@ -81,6 +81,7 @@ IVI: Bootloader: True BootloaderAppend: "quiet" BootloaderTimeout: 0 + BootloaderOptions: --test Session: "/usr/bin/startivi" StartX: True Groups: diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl index d23e652..1ac13be 100644 --- a/kickstart/kickstart.tmpl +++ b/kickstart/kickstart.tmpl @@ -19,9 +19,19 @@ rootpw ${metadata.RootPass} #if $metadata.has_key("StartX") xconfig --startxonboot #end if -#if $metadata.has_key("Bootloader") -bootloader --timeout=${metadata.BootloaderTimeout} --append="${metadata.BootloaderAppend}" ${metadata.BootloaderOptions} +#if $metadata.has_key("BootloaderTimeout") or $metadata.has_key("BootloaderAppend") or $metadata.has_key("BootloaderOptions") +bootloader #slurp #end if +#if $metadata.has_key("BootloaderTimeout") + --timeout=${metadata.BootloaderTimeout} #slurp +#end if +#if $metadata.has_key("BootloaderAppend") + --append="${metadata.BootloaderAppend}" #slurp +#end if +#if $metadata.has_key("BootloaderOptions") + ${metadata.BootloaderOptions} +#end if + #if $metadata.has_key("Desktop") desktop --autologinuser=${metadata.DefaultUser} #slurp #if $metadata.Desktop != "None" |