Merge pull request #163 from imobach/fix-autoyast-schema-sle12-ga

Fix AutoYaST schema in SLE 12 GA
yast · Nov 17, 2015 · 2aabaf2 · 2aabaf2
2 parents 5ca1430 + 2553920
commit 2aabaf2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 13 11:08:27 UTC 2015 - igonzalezsosa@suse.com
+
+- Fix validation of AutoYaST profiles (bsc#954412)
+- 3.1.69.10
+
 -------------------------------------------------------------------
 Tue Nov  3 10:11:10 UTC 2015 - igonzalezsosa@suse.com
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.69.9
+Version:        3.1.69.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/autoyast-rnc/general.rnc b/src/autoyast-rnc/general.rnc
@@ -54,10 +54,11 @@ general = element general {
                 }
             }*
         }?
-    }?
+    }? &
+    cio_ignore?
 }
 ask-list = element ask-list { LIST, ask* }
-ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & ask_type? & ask_password? & ask_path? & ask_pathlist? & ask_stage? & ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & ask_script? & ask_timeout? }
+ask = element ask { ask_question? & ask_default? & ask_help? & ask_title? & ask_type? & ask_password? & ask_path? & ask_pathlist? & ask_stage? & ask_selection? & ask_file? & ask_dialog? & ask_element? & ask_frametitle? & ask_script? & ask_timeout? & ask_ok_label? & ask_back_label? }
 ask_question = element question { text }
 ask_default = element default { text }
 ask_help = element help { text }
@@ -71,14 +72,16 @@ ask_selection_entry = element entry { ask_entry_value & ask_entry_label }
 ask_file = element file { text }
 ask_entry_value = element value { text }
 ask_entry_label = element label { text }
-ask_dialog = element dialog { text }
-ask_element = element element { text }
+ask_dialog = element dialog { INTEGER }
+ask_element = element element { INTEGER }
 ask_frametitle = element frametitle { text }
 ask_timeout = element timeout { INTEGER }
 ask_pathlist =  element pathlist {
     LIST,
     ask_path*
 }
+ask_ok_label = element ok_label { text }
+ask_back_label = element back_label { text }
 
 semi-automatic = element semi-automatic { LIST, semi-automatic-modules* }
 semi-automatic-modules = element module { "networking" | "partitioning" | "scc" }
@@ -117,3 +120,6 @@ second_stage =
 mouse = element mouse { 
     element id { text }
     }
+
+cio_ignore =
+  element cio_ignore { BOOLEAN }
diff --git a/src/autoyast-rnc/partitioning.rnc b/src/autoyast-rnc/partitioning.rnc
@@ -17,6 +17,8 @@ drive =
     element type       { SYMBOL }? &
     element use        { text }? &
     element imsmdriver { SYMBOL }? &
+    element disklabel  { text }? &
+    element enable_snapshots { BOOLEAN }? &
     partitions?
   }
 prefer_remove =

diff --git a/src/autoyast-rnc/software.rnc b/src/autoyast-rnc/software.rnc
@@ -13,6 +13,7 @@ software =
     remove-patterns? &
     products? &
     remove-products? &
+    image? &
     element do_online_update { BOOLEAN }? &
     element install_recommended { BOOLEAN }? &
     element instsource {text}?
@@ -58,3 +59,17 @@ remove-products =
     LIST,
     element product {text}+
   }
+script_params =
+  element script_params {
+      LIST,
+      element listentry { text }
+  }
+
+image =
+  element image {
+    element image_location  { text }? &
+    element image_name      { text }? &
+    element script_location { text }? &
+    script_params? &
+    element run_kickoff     { BOOLEAN }?
+  }