Author: ug Date: Tue Apr 24 14:07:09 2012 New Revision: 68007 URL: http://svn.opensuse.org/viewcvs/yast?rev=68007&view=rev Log: rnc file fixes Modified: trunk/autoinstallation/src/schema/general.rnc trunk/autoinstallation/src/schema/scripts.rnc Modified: trunk/autoinstallation/src/schema/general.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/general.rnc?rev=68007&r1=68006&r2=68007&view=diff ============================================================================== --- trunk/autoinstallation/src/schema/general.rnc (original) +++ trunk/autoinstallation/src/schema/general.rnc Tue Apr 24 14:07:09 2012 @@ -3,7 +3,14 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" general = element general { - mode? & + element mode { + element confirm { BOOLEAN }? & + element halt { BOOLEAN }? & + element second_stage { BOOLEAN }? & + element final_halt { BOOLEAN }? & + element final_reboot { BOOLEAN }? & + element forceboot { BOOLEAN }? + } mouse? & ask-list? & signature-handling? & @@ -53,7 +60,6 @@ ask_title = element title { text } ask_type = element type { ( "symbol" | "integer" | "boolean" | "string" ) } ask_password = element password { BOOLEAN } -ask_path = element path { text } ask_stage = element stage { "cont" | "initial" } ask_selection = element selection { LIST, ask_selection_entry+ } ask_selection_entry = element entry { ask_entry_value & ask_entry_label } @@ -87,10 +93,6 @@ element rerun_on_error { BOOLEAN }? } -mode = - element mode { - confirm? & halt? & second_stage? & final_halt? & final_reboot? & forceboot? - } confirm = element confirm { BOOLEAN } final_halt = Modified: trunk/autoinstallation/src/schema/scripts.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/schema/scripts.rnc?rev=68007&r1=68006&r2=68007&view=diff ============================================================================== --- trunk/autoinstallation/src/schema/scripts.rnc (original) +++ trunk/autoinstallation/src/schema/scripts.rnc Tue Apr 24 14:07:09 2012 @@ -19,7 +19,7 @@ post-scripts = element post-scripts { LIST, - autoinstall-script+ + autoinstall-post-script+ } pre-scripts = element pre-scripts { @@ -49,6 +49,17 @@ element notification { text }? } +autoinstall-post-script = element script { + filename? & + interpreter? & + element location { text }? & + source? & + debug? & + feedback? & + element notification { text }? & + element network_needed { BOOLEAN } +} + autoinstall-init-script = element script { filename? & element location { text }? & @@ -74,3 +85,4 @@ filename = element filename { text } interpreter = element interpreter { text } source = element source { text } +network_needed = element network_needed { BOOLEAN } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org