- do not propose desktop kernel for minimal installation

  (bnc#819335)
- 2.24.0

VERSION

@@ -1 +1 @@
-2.23.29
+2.24.0

library/system/src/Kernel.ycp

@@ -41,6 +41,7 @@ you may find current contact information at www.novell.com
     import "Arch";
     import "Mode";
     import "Linuxrc";
+    import "PackagesProposal";
     import "Popup";
     import "Stage";
 
@@ -363,7 +364,16 @@ global void SetCmdLine (string new_cmd_line) {
     cmdLine = new_cmd_line;
 }
 
+/**
+ * Simple check any graphical desktop was selected
+ */
+boolean IsGraphicalDesktop () {
 
+  // Get patterns set for installation during desktop selection
+  // (see DefaultDesktop::packages_proposal_ID_patterns for the first argument)
+  list<string> pt = PackagesProposal::GetResolvables ("DefaultDesktopPatterns", `pattern);
+  return contains (pt, "x11");
+}
 
     //---------------------------------------------------------------
 
@@ -427,7 +437,7 @@ global void SetCmdLine (string new_cmd_line) {
 	    if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae"))
 	    {
 		y2milestone ("Kernel switch: PAE detected");
-		if (kernel_desktop_exists && true) { // FIXME: check whether it is really desktop
+		if (kernel_desktop_exists && IsGraphicalDesktop ()) {
 		    kernel_packages = ["kernel-desktop"];
 
 		    // add PV drivers
@@ -461,7 +471,7 @@ global void SetCmdLine (string new_cmd_line) {
 	}
 	else if (Arch::x86_64())
 	{
-	    if (kernel_desktop_exists && true) { // FIXME: detect desktop
+	    if (kernel_desktop_exists && IsGraphicalDesktop ()) {
 		kernel_packages = ["kernel-desktop"];
 		if (xen)
 		{

package/yast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 21 15:24:25 CEST 2013 - jsuchome@suse.cz
+
+- do not propose desktop kernel for minimal installation
+  (bnc#819335) 
+- 2.24.0
+
 -------------------------------------------------------------------
 Thu May 16 12:41:09 UTC 2013 - jsrain@suse.cz