Author: locilka Date: Wed Dec 9 14:15:36 2009 New Revision: 60022 URL: http://svn.opensuse.org/viewcvs/yast?rev=60022&view=rev Log: - Enabled CIM by default (SLES and SLED) (FATE #305583) - Adapted RNC for control files Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/control/control.rnc trunk/installation/package/yast2-installation.changes Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=60022&r1=60021&r2=60022&view=diff ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Wed Dec 9 14:15:36 2009 @@ -137,6 +137,8 @@ modem remote firewall + <!-- FATE #305583: Start CIMOM by default --> + services <!-- hardware proposal --> @@ -175,6 +177,19 @@ <!-- bnc #431259 --> false + + <!-- Used in services proposal --> + + <!-- FATE #305583: Start CIMOM by default --> + <service> + <!-- see 'texts' --> + service_sfcb + sfcb + sblim-sfcb + true + <packages>sblim-sfcb</packages> + </service> + </globals> <software> @@ -350,6 +365,9 @@ <label>Configuring network...</label> <label>Configuring hardware...</label> <label>Finishing configuration...</label> + + <!-- FATE #305583: Start CIMOM by default --> + <label>CIM Server</label> </texts> <proposals config:type="list"> @@ -521,6 +539,11 @@ <name>proxy</name> 70 + <!-- FATE #305583: Start CIMOM by default --> + + <name>services</name> + 15 + </proposal> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=60022&r1=60021&r2=60022&view=diff ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Dec 9 14:15:36 2009 @@ -95,6 +95,19 @@ <!-- bnc #431158: Adjusts /etc/sysconfig/security/POLKIT_DEFAULT_PRIVS if set --> restrictive + + <!-- Used in services proposal --> + + <!-- FATE #305583: Start CIMOM by default --> + <service> + <!-- see 'texts' --> + service_sfcb + sfcb + sblim-sfcb + true + <packages>sblim-sfcb</packages> + </service> + </globals> <software> @@ -312,6 +325,9 @@ <label>Physical Machine (Also for Fully Virtualized Guests)</label> <label>Virtual Machine (For Paravirtualized Environments Like Xen)</label> <label>Xen Virtualization Host (Local X11 Not Configured by Default)</label> + + <!-- FATE #305583: Start CIMOM by default --> + <label>CIM Server</label> </texts> <proposals config:type="list"> @@ -636,6 +652,8 @@ ca_mgm ldap-server + <!-- FATE #305583 --> + services </proposal> Modified: trunk/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc?rev=60022&r1=60021&r2=60022&view=diff ============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Wed Dec 9 14:15:36 2009 @@ -84,6 +84,7 @@ | runlevel | debug_deploying | require_registration + | services_proposal additional_kernel_parameters = element additional_kernel_parameters { text } incomplete_translation_treshold = element incomplete_translation_treshold { text } @@ -173,6 +174,17 @@ }+ } +services_proposal = element services_proposal { + LIST, + element service { + element label_id { text }? & + element service_names { text } & + element firewall_plugins { text }? & + element enabled_by_default { BOOLEAN }? & + element packages { text }? + }+ +} + subworkflows = element subworkflows { LIST, element subworkflow { Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=60022&r1=60021&r2=60022&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Dec 9 14:15:36 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 14:12:21 CET 2009 - locilka@suse.cz + +- Enabled CIM by default (SLES and SLED) (FATE #305583) +- Adapted RNC for control files + +------------------------------------------------------------------- Wed Dec 9 12:49:08 CET 2009 - jsrain@suse.cz - dereference hardlinks when deploying live CD so that it can -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org