[yast-commit] r58202 - in /trunk/yast2: VERSION library/system/src/Kernel.ycp package/yast2.changes

Author: jsrain Date: Wed Jul 29 14:45:13 2009 New Revision: 58202 URL: http://svn.opensuse.org/viewcvs/yast?rev=58202&view=rev Log: select kernel-desktop by default if exists Modified: trunk/yast2/VERSION trunk/yast2/library/system/src/Kernel.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=58202&r1=58201&... ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Jul 29 14:45:13 2009 @@ -1 +1 @@ -2.18.21 +2.18.22 Modified: trunk/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Kernel.y... ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Wed Jul 29 14:45:13 2009 @@ -91,6 +91,7 @@ */ map<string, string> fallbacks = $[ "kernel-pae" : "kernel-default", + "kernel-desktop" : "kernel-default", // fallback for PPC (#302246) "kernel-iseries64" : "kernel-ppc64" ]; @@ -352,6 +353,11 @@ */ global define void ProbeKernel () { + boolean kernel_desktop_exists = + ((Mode::normal () || Mode::repair()) && Pkg::PkgInstalled("kernel-desktop")) || + Pkg::PkgAvailable("kernel-desktop"); + y2milestone ("Desktop kernel available: %1", kernel_desktop_exists); + kernel_packages = ["kernel-default"]; // add Xen paravirtualized drivers to a full virtualized host @@ -400,13 +406,26 @@ if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); - kernel_packages = ["kernel-pae"]; + if (kernel_desktop_exists && true) { // FIXME: check whether it is really desktop + kernel_packages = ["kernel-desktop"]; - // add PV drivers - if (xen) + // add PV drivers + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-desktop"); + kernel_packages = add(kernel_packages, "xen-kmp-desktop"); + } + } + else { - y2milestone("Adding Xen PV drivers: xen-kmp-pae"); - kernel_packages = add(kernel_packages, "xen-kmp-pae"); + kernel_packages = ["kernel-pae"]; + + // add PV drivers + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-pae"); + kernel_packages = add(kernel_packages, "xen-kmp-pae"); + } } } else @@ -421,10 +440,21 @@ } else if (Arch::x86_64()) { - if (xen) + if (kernel_desktop_exists && true) { // FIXME: detect desktop + kernel_packages = ["kernel-desktop"]; + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-desktop"); + kernel_packages = add(kernel_packages, "xen-kmp-desktop"); + } + } + else { - y2milestone("Adding Xen PV drivers: xen-kmp-default"); - kernel_packages = add(kernel_packages, "xen-kmp-default"); + if (xen) + { + y2milestone("Adding Xen PV drivers: xen-kmp-default"); + kernel_packages = add(kernel_packages, "xen-kmp-default"); + } } } else if (Arch::ppc ()) Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=5... ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Jul 29 14:45:13 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jul 29 14:44:48 CEST 2009 - jsrain@suse.cz + +- select kernel-desktop by default if exists +- 2.18.22 + +------------------------------------------------------------------- Thu Jul 16 14:06:37 CEST 2009 - jsuchome@suse.cz - Wizard.ycp: use Fancy UI for 1024x576 screen size (fate#306298) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
jsrain@svn.opensuse.org