Author: jreidinger Date: Tue Nov 2 19:05:58 2010 New Revision: 62723 URL: http://svn.opensuse.org/viewcvs/yast?rev=62723&view=rev Log: Fix detection of HyperV as during install there is not lscpu utility (bnc#650780) Modified: 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/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/bootloader/package/yast2-bootloader.changes?rev=62723&r1=62722&r2=62723&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 2 19:05:58 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 2 18:04:50 UTC 2010 - jreidinger@novell.com + +- Fix detection of HyperV as during install there is not lscpu + utility (bnc#650780) +- 2.13.167 + +------------------------------------------------------------------- Fri Oct 22 10:12:58 UTC 2010 - jreidinger@novell.com - add detection of HyperV and boot parameter for it (FATE#309005) 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=62723&r1=62722&r2=62723&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 2 19:05:58 2010 @@ -2009,10 +2009,9 @@ boolean xen = (boolean)SCR::Read(.probe.is_xen); // check if it is HVM guest only if ((!Arch::is_xen()) && (xen == true)) - ret = true; - string hyperV = ((map<string, any>)SCR::Execute(.target.bash_output, - "lscpu | grep -c '^Hypervisor vendor:[[:blank:]]*Microsoft$'"))["stdout"]:"0"; - if (hyperV == "1") //TODO convert to int + 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) ret = true; return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org