Author: locilka Date: Tue Oct 7 17:39:41 2008 New Revision: 51928 URL: http://svn.opensuse.org/viewcvs/yast?rev=51928&view=rev Log: - Removing desktop definitions and default_desktop from SLED control file, the required patterns are selected by PATTERNS in content file already (bnc #431902). + A better solution for default_desktop Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_scenarios.ycp Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLED.xml?rev=51928&r1=51927&r2=51928&view=diff ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Tue Oct 7 17:39:41 2008 @@ -183,23 +183,6 @@ auto default-Gnome - - <!-- BNC #424678 Definition of supported desktops --> - <!-- BNC #427061 The default desktop has to be set here --> - - - <name>gnome</name> - <desktop>gnome</desktop> - desktop_gnome - <logon>gdm</logon> - <cursor>DMZ</cursor> - <packages>gdm</packages> - <order config:type="integer">1</order> - <patterns>gnome x11 base</patterns> - - - - gnome </software> <partitioning> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLES.xml?rev=51928&r1=51927&r2=51928&view=diff ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Tue Oct 7 17:39:41 2008 @@ -149,20 +149,6 @@ <!-- BNC #424678 Definition of supported desktops --> <!-- BNC #427061 The default desktop has to be set here --> - <!-- Minimal 'desktop' used when inst_scenarios are called --> - - <name>desktop_for_scenarios</name> - <desktop>gnome</desktop> - dummy_desktop - <logon>gdm</logon> - <cursor>DMZ</cursor> - <order config:type="integer">1</order> - <!-- No patterns, not packages to install or delete --> - <patterns></patterns> - <packages></packages> - true - - <!-- Used for non-i386/non-x86_64 machines --> <name>desktop_gnome</name> @@ -177,9 +163,6 @@ - <!-- inst_scenarios have to set a different desktop --> - desktop_for_scenarios - desktop_gnome </software> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=51928&r1=51927&r2=51928&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Oct 7 17:39:41 2008 @@ -10,6 +10,9 @@ convwerting it - not in use anymore (bnc #432572). - Always change initial proposal [Next] button to [Install], resp. [Update] (bnc #431567). +- Removing desktop definitions and default_desktop from SLED + control file, the required patterns are selected by PATTERNS + in content file already (bnc #431902). - 2.17.18 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/inst_scenarios.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_scenarios.ycp?rev=51928&r1=51927&r2=51928&view=diff ============================================================================== --- trunk/installation/src/clients/inst_scenarios.ycp (original) +++ trunk/installation/src/clients/inst_scenarios.ycp Tue Oct 7 17:39:41 2008 @@ -111,11 +111,10 @@ } }); - string desktop = ProductFeatures::GetStringFeature ("software", "scenarios_desktop"); - y2milestone ("Using default desktop: %1", desktop); - - DefaultDesktop::SetDesktop (desktop); - Packages::ForceFullRepropose(); + // conflicts with the default desktop feature, thus it removes + // the resolvables that the DefaultDesktop could require + y2warning ("Removing all default_desktop related resolvables..."); + DefaultDesktop::SetDesktop (nil); } // adjusting test mode - not used in installation -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org