Author: jsrain Date: Wed Sep 12 11:26:06 2007 New Revision: 40861 URL: http://svn.opensuse.org/viewcvs/yast?rev=40861&view=rev Log: reverted Fate #159006 (always using bigsmp kernel if PAE detected (#309468) Modified: trunk/yast2/library/system/src/Kernel.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/system/src/Kernel.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Kernel.ycp?rev=40861&r1=40860&r2=40861&view=diff ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Wed Sep 12 11:26:06 2007 @@ -384,17 +384,15 @@ y2error ("Cannot read cpuflags"); y2milestone ("Mounted: %1", SCR::Execute (.target.bash_output, "mount -l")); } -/* + // check for "roughly" >= 4GB memory (see bug #40729) list memories = (list) SCR::Read(.probe.memory); integer memsize = memories[0,"resource","phys_mem",0,"range"]:0; integer fourGB = 0x0C0000000; y2milestone ("Physical memory %1", memsize); -*/ + // for memory > 4GB and PAE support we install kernel-bigsmp, - // regardles of SMP or not. -// install bigsmp kernel regardless the memory size - fate #159006 - if (/*memsize >= fourGB &&*/ contains (cpuflags, "pae")) + if (memsize >= fourGB && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); kernel_packages = ["kernel-bigsmp"]; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=40861&r1=40860&r2=40861&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Sep 12 11:26:06 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 12 11:24:50 CEST 2007 - jsrain@suse.cz + +- reverted Fate #159006 (always using bigsmp kernel if PAE detected + (#309468) + +------------------------------------------------------------------- Tue Sep 11 10:23:08 CEST 2007 - varkoly@suse.de - Fixed Provides list (#309420) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org