better support bootloader options

diff --git a/configurations.yaml b/configurations.yaml
index 30936c6..724ebd6 100644 (file)
--- 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 (file)
--- 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"