Author: locilka Date: Fri Dec 5 13:27:26 2008 New Revision: 53922 URL: http://svn.opensuse.org/viewcvs/yast?rev=53922&view=rev Log: Some more options Modified: trunk/installation/control/Makefile.am trunk/installation/control/control.rnc Modified: trunk/installation/control/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/Makefile.am?rev=53922&r1=53921&r2=53922&view=diff ============================================================================== --- trunk/installation/control/Makefile.am (original) +++ trunk/installation/control/Makefile.am Fri Dec 5 13:27:26 2008 @@ -6,8 +6,8 @@ control_DATA = \ control.xml \ - control.rng \ - control.rnc + control.rnc \ + control.rng # Note: The control.glade -> control.xml symlink is required to make xgettext @@ -20,6 +20,8 @@ EXTRA_DIST = $(control_DATA) $(product_DATA) +CLEANFILES = control.rng + include $(top_srcdir)/Makefile.am.common control.rng: Modified: trunk/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc?rev=53922&r1=53921&r2=53922&view=diff ============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Fri Dec 5 13:27:26 2008 @@ -68,6 +68,9 @@ | displaymanager_shutdown | enable_kdump | polkit_default_privs + | debug_workflow + | subworkflows + | default_subworkflow additional_kernel_parameters = element additional_kernel_parameters { text } incomplete_translation_treshold = element incomplete_translation_treshold { text } @@ -75,7 +78,9 @@ ui_mode = element ui_mode { text } displaymanager_shutdown = element displaymanager_shutdown { text } polkit_default_privs = element polkit_default_privs { text } +default_subworkflow = element default_subworkflow { text } +debug_workflow = element debug_workflow { BOOLEAN } enable_autologin = element enable_autologin { BOOLEAN } enable_firewall = element enable_firewall { BOOLEAN } firewall_enable_ssh = element firewall_enable_ssh { BOOLEAN } @@ -143,6 +148,21 @@ }+ } +subworkflows = element subworkflows { + LIST, + element subworkflow { + element name { text } & + element modules { + LIST, + element module { text }+ + }? & + element proposals { + LIST, + element proposal { text }+ + }? + }+ +} + globals = element globals { globals_elements* } @@ -170,6 +190,7 @@ | dropped_packages | extra_urls | base_selection + | packages_affecting_pkg_manager delete_old_packages = element delete_old_packages { BOOLEAN } selection_type = element selection_type { SYMBOL } @@ -241,6 +262,11 @@ }+ } +packages_affecting_pkg_manager = element packages_affecting_pkg_manager { + LIST, + element package { text }+ +} + software = element software { software_elements* } @@ -371,15 +397,23 @@ element arguments { element first_run { "yes" | "no" }? | element * { text }* + # used in autoyast + | text }? & element retranslate { BOOLEAN }? & element update { BOOLEAN }? & - element enabled { BOOLEAN }? + element enabled { BOOLEAN }? & + element postscript { + element interpreter { text } & + element source { text } + }? } workflow = element workflow { element defaults { element archs { text }? & + # used in autoyast + element arguments { text }? & element enable_back { "yes" | "no" }? & element enable_next { "yes" | "no" }? }? & @@ -399,6 +433,21 @@ # workflows +# inst_finish_stages + +inst_finish_stages = element inst_finish_stages { + LIST, + element inst_finish_stage { + element label { text } & + element steps { + LIST, + element step { text }+ + } + }+ +} + +# inst_finish_stages + productDefines_elements = textdomain | globals @@ -409,6 +458,7 @@ | workflows | clone_modules | texts + | inst_finish_stages start = element productDefines { productDefines_elements* -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org