Author: jreidinger Date: Tue Nov 9 15:24:06 2010 New Revision: 62781 URL: http://svn.opensuse.org/viewcvs/yast?rev=62781&view=rev Log: modprobing hyperV module cause KVM crash, so return bakc to lscpu and add it to inst-sys Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION?rev=62781&r1=62780&r2=62781&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/VERSION Tue Nov 9 15:24:06 2010 @@ -1 +1 @@ -2.13.167 +2.13.168 Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes?rev=62781&r1=62780&r2=62781&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes Tue Nov 9 15:24:06 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 9 12:42:14 UTC 2010 - jreidinger@novell.com + +- switch back to lscpu as modprobing cause crash on KVM. lscpu are + going to be inside inst-sys. +- 2.13.168 + +------------------------------------------------------------------- Tue Nov 2 18:04:50 UTC 2010 - jreidinger@novell.com - Fix detection of HyperV as during install there is not lscpu Modified: branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp?rev=62781&r1=62780&r2=62781&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/bootloader/src/routines/misc.ycp Tue Nov 9 15:24:06 2010 @@ -2010,8 +2010,8 @@ // check if it is HVM guest only if ((!Arch::is_xen()) && (xen == true)) ret = true; - integer hyperV = (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus"); - if (hyperV == 0) //module can be loaded, so we are in HyperV (bnc#650780) + integer hyperV = (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null"); + if (hyperV == 0) //there is microsoft as hypervisor vendor (bnc#650780) ret = true; return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org