Merge pull request #284 from imobach/fix-autoyast-schema-sle12-sp1

Fix AutoYaST schema in SLE 12 SP1
yast · Nov 20, 2015 · 7ae2eee · 7ae2eee
2 parents 49d6c7c + 675d1c5
commit 7ae2eee
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov 20 07:19:26 UTC 2015 - igonzalezsosa@suse.com
+
+- Fix AutoYaST schema to allow specification of 'vgamode',
+  'xen_kernel_append' and 'failsafe_disabled' in globals section
+  (bsc#954412)
+
+-------------------------------------------------------------------
+Wed Nov 18 12:10:10 UTC 2015 - mvidner@suse.com
+
+- Fix validation of AutoYaST profiles (bsc#954412)
+
 -------------------------------------------------------------------
 Tue Nov 17 13:59:40 CET 2015 - shundhammer@suse.de
 

diff --git a/src/autoyast-rnc/bootloader.rnc b/src/autoyast-rnc/bootloader.rnc
@@ -41,6 +41,21 @@ loader_type = element loader_type { text }
 bl_location = element location { text }
 bl_global =
   element global {
+    element append          { text }? &
+    element append_failsafe { text }? &
+    element cryptodisk      { INTEGER }? &
+    element distributor     { text }? &
+    element gfxbackground   { text }? &
+    element gfxmode         { text }? &
+    element gfxtheme        { text }? &
+    # really "true"|"false", without config:type=boolean
+    element failsafe_disabled { "true" | "false" }? &
+    element hiddenmenu      { "true" | "false" }? &
+    element os_prober       { "true" | "false" }? &
+    element suse_btrfs      { "true" | "false" }? &
+    element xen_append        { text }? &
+    element xen_kernel_append { text }? &
+
     element boot_custom { text }? &
     element generic_mbr { text }? &
     element trusted_grub{ text }? &
@@ -55,7 +70,8 @@ bl_global =
     boot_boot? &
     boot_extended? &
     boot_mbr? &
-    stage1_dev?
+    stage1_dev? &
+    element vgamode { text }?
   }
 
 lines_cache_id = element lines_cache_id { text }
@@ -77,6 +93,8 @@ sections =
   }
 section =
   element section {
+    element menuentry {text}? &
+    element usage   {text}? &
     element append  {text}? &
     element initial {text}? &
     element console {text}? &

diff --git a/src/lib/bootloader/auto_client.rb b/src/lib/bootloader/auto_client.rb
@@ -63,6 +63,15 @@ def change
       BootloaderAutoSequence()
     end
 
+    # Return configuration data
+    #
+    # Some of the sections are useless as they're ignored during import.
+    # (for example, entries are generated by Grub2 itself).
+    #
+    # More details can be found in the original pull request at
+    # https://github.com/yast/yast-bootloader/pull/272
+    #
+    # return map or list
     def export
       Export2AI(Yast::Bootloader.Export)
     end