Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/SLE-12-SP1' into merge-sle-12-…
Browse files Browse the repository at this point in the history
…sp1-into-master

* upstream/SLE-12-SP1:
  Fix validation of AutoYaST profiles
  • Loading branch information
imobachgs committed Jan 13, 2016
2 parents 4dbe5a8 + 1d4242a commit 21041d2
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 6 deletions.
5 changes: 5 additions & 0 deletions package/autoyast2.changes
@@ -1,3 +1,8 @@
Wed Jan 13 11:40:25 UTC 2016 - igonzalezsosa@suse.com

- Fix validation of AutoYaST profiles (bsc#954412)
- 3.1.109

-------------------------------------------------------------------
Tue Jan 12 15:25:18 CET 2016 - schubi@suse.de

Expand Down
14 changes: 10 additions & 4 deletions src/autoyast-rnc/general.rnc
Expand Up @@ -55,10 +55,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 }
Expand All @@ -72,14 +73,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" }
Expand Down Expand Up @@ -120,3 +123,6 @@ second_stage =
mouse = element mouse {
element id { text }
}

cio_ignore =
element cio_ignore { BOOLEAN }
2 changes: 2 additions & 0 deletions src/autoyast-rnc/partitioning.rnc
Expand Up @@ -17,6 +17,8 @@ drive =
element type { SYMBOL }? &
element use { text }? &
element imsmdriver { SYMBOL }? &
element disklabel { text }? &
element enable_snapshots { BOOLEAN }? &
partitions?
}
prefer_remove =
Expand Down
3 changes: 1 addition & 2 deletions src/autoyast-rnc/scripts.rnc
Expand Up @@ -57,7 +57,7 @@ autoinstall-post-script = element script {
debug? &
feedback? &
element notification { text }? &
element network_needed { BOOLEAN }
element network_needed { BOOLEAN }?
}

autoinstall-init-script = element script {
Expand Down Expand Up @@ -91,4 +91,3 @@ feedback_type = element feedback_type { text }
filename = element filename { text }
interpreter = element interpreter { text }
source = element source { text }
network_needed = element network_needed { BOOLEAN }
15 changes: 15 additions & 0 deletions src/autoyast-rnc/software.rnc
Expand Up @@ -13,6 +13,7 @@ software =
remove-patterns? &
products? &
remove-products? &
image? &
element do_online_update { BOOLEAN }? &
element install_recommended { BOOLEAN }? &
element instsource {text}?
Expand Down Expand Up @@ -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 }?
}

0 comments on commit 21041d2

Please sign in to comment.