Author: locilka Date: Thu Oct 2 13:47:02 2008 New Revision: 51790 URL: http://svn.opensuse.org/viewcvs/yast?rev=51790&view=rev Log: - Using two default desktops, one for inst_scenarios, another one (default) while inst_scenarios not used (bnc #431251, bnc #431503). - Switching scenario_virtual_machine and scenario_virtualization_host in SLES control file (bnc #431251). - 2.17.17 Modified: trunk/installation/VERSION trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_scenarios.ycp trunk/installation/yast2-installation.spec.in Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=51790&r1=51789&r2=51790&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Oct 2 13:47:02 2008 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=51790&r1=51789&r2=51790&view=diff ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Thu Oct 2 13:47:02 2008 @@ -146,21 +146,38 @@ <!-- BNC #424678 Definition of supported desktops --> <!-- BNC #427061 The default desktop has to be set here --> <supported_desktops config:type="list"> + <!-- Minimal 'desktop' used when inst_scenarios are called --> <one_supported_desktop> - <name>default_desktop</name> + <name>desktop_for_scenarios</name> <desktop>gnome</desktop> - <label_id>default_desktop</label_id> + <label_id>desktop_for_scenarios</label_id> <logon>gdm</logon> <cursor>DMZ</cursor> - <packages>gdm</packages> <order config:type="integer">1</order> - <!-- No patterns to install or delete --> + <!-- No patterns, not packages to install or delete --> <patterns></patterns> + <packages></packages> + <do_not_deselect_patterns config:type="boolean">true</do_not_deselect_patterns> + </one_supported_desktop> + + <!-- Used for non-i386/non-x86_64 machines --> + <one_supported_desktop> + <name>desktop_gnome</name> + <desktop>gnome</desktop> + <label_id>desktop_gnome</label_id> + <logon>gdm</logon> + <cursor>DMZ</cursor> + <packages>gdm</packages> + <order config:type="integer">1</order> + <patterns>base x11 gnome apparmor print_server 32bit 64bit x86 documentation</patterns> <icon>pattern-gnome</icon> </one_supported_desktop> </supported_desktops> - <default_desktop>default_desktop</default_desktop> + <!-- inst_scenarios have to set a different desktop --> + <scenarios_desktop>desktop_for_scenarios</scenarios_desktop> + + <default_desktop>desktop_gnome</default_desktop> </software> <partitioning> @@ -224,7 +241,9 @@ </congratulate> <!-- Empty string is intentional, bnc #431251, there needn't be any desktop --> - <default_desktop><label></label></default_desktop> + <desktop_for_scenarios><label></label></desktop_for_scenarios> + <!-- Default desktop for non-i386/non-x86_64 machines --> + <desktop_gnome><label>GNOME</label></desktop_gnome> <!-- FATE #304373: Server scenarios --> <scenarios_caption><label>Server Base Scenario</label></scenarios_caption> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=51790&r1=51789&r2=51790&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Oct 2 13:47:02 2008 @@ -1,10 +1,12 @@ ------------------------------------------------------------------- Thu Oct 2 11:39:48 CEST 2008 - locilka@suse.cz -- No patterns listed in SLES default desktop, package proposal - will not add them (bnc #431503). +- Using two default desktops, one for inst_scenarios, another + one (default) while inst_scenarios not used (bnc #431251, + bnc #431503). - Switching scenario_virtual_machine and scenario_virtualization_host in SLES control file (bnc #431251). +- 2.17.17 ------------------------------------------------------------------- Wed Oct 1 16:03:32 CEST 2008 - mzugec@suse.de Modified: trunk/installation/src/clients/inst_scenarios.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_scenarios.ycp?rev=51790&r1=51789&r2=51790&view=diff ============================================================================== --- trunk/installation/src/clients/inst_scenarios.ycp (original) +++ trunk/installation/src/clients/inst_scenarios.ycp Thu Oct 2 13:47:02 2008 @@ -20,6 +20,8 @@ import "Popup"; import "PackageCallbacks"; import "Report"; + import "Packages"; + import "DefaultDesktop"; boolean test_mode = false; @@ -110,12 +112,21 @@ // select newly selected patterns for installation foreach (map <string, string> one_scenario, system_scenarios, { if (one_scenario["id"]:"---" == chosen_selection) { - foreach (string one_pattern, splitstring (one_scenario["patterns"]:"", " \t"), { + list <string> patterns_to_install = splitstring (one_scenario["patterns"]:"", " \t"); + + foreach (string one_pattern, patterns_to_install, { y2milestone ("Selecting pattern: %1", one_pattern); Pkg::ResolvableInstall (one_pattern, `pattern); }); + + Packages::required_patterns = patterns_to_install; + y2milestone ("Packages::required_patterns: %1", Packages::required_patterns); } }); + + string desktop = ProductFeatures::GetStringFeature ("software", "scenarios_desktop"); + y2milestone ("Using default desktop: %1", desktop); + DefaultDesktop::SetDesktop (desktop); } // adjusting test mode - not used in installation Modified: trunk/installation/yast2-installation.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/yast2-installation.spec.in?rev=51790&r1=51789&r2=51790&view=diff ============================================================================== --- trunk/installation/yast2-installation.spec.in (original) +++ trunk/installation/yast2-installation.spec.in Thu Oct 2 13:47:02 2008 @@ -25,8 +25,8 @@ # Language::Set (handles downloading the translation extensions) Requires: yast2-country-data >= 2.16.11 -# Unified progress bar (done by visnov) -Requires: yast2-packager >= 2.17.9 +# Packages::required_patterns +Requires: yast2-packager >= 2.17.23 # Only in inst-sys # Requires: yast2-runlevel -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org