Author: jsrain Date: Wed Feb 18 15:39:30 2009 New Revision: 55592 URL: http://svn.opensuse.org/viewcvs/yast?rev=55592&view=rev Log: use PAE kernel only if there is >3GB of RAM or NX flag is present (bnc#467328) 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=55592&r1=55591&r2=55592&view=diff ============================================================================== --- trunk/yast2/library/system/src/Kernel.ycp (original) +++ trunk/yast2/library/system/src/Kernel.ycp Wed Feb 18 15:39:30 2009 @@ -379,16 +379,16 @@ 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-pae, - // only check PAE CPU - if (/*memsize >= fourGB &&*/ contains (cpuflags, "pae")) + // PAE kernel is needed if NX flag exists as well (bnc#467328) + if ((memsize >= fourGB || contains (cpuflags, "nx")) && contains (cpuflags, "pae")) { y2milestone ("Kernel switch: PAE detected"); kernel_packages = ["kernel-pae"]; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=55592&r1=55591&r2=55592&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Feb 18 15:39:30 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 18 15:37:29 CET 2009 - jsrain@suse.cz + +- use PAE kernel only if there is >3GB of RAM or NX flag is present + (bnc#467328) + +------------------------------------------------------------------- Mon Feb 16 10:45:05 CET 2009 - mzugec@suse.cz - assign to GetInstArgs.args first map, not first argument (bnc#475169) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org