Author: jsrain Date: Tue Nov 9 14:43:21 2010 New Revision: 62773 URL: http://svn.opensuse.org/viewcvs/yast?rev=62773&view=rev Log: detect HyperV according to lscpu (bnc#652305) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/VERSION?rev=62773&r1=62772&r2=62773&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/VERSION Tue Nov 9 14:43:21 2010 @@ -1 +1 @@ -2.13.188 +2.13.189 Modified: branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes?rev=62773&r1=62772&r2=62773&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/package/yast2-packager.changes Tue Nov 9 14:43:21 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 9 13:50:17 CET 2010 - jsrain@suse.cz + +- detect HyperV according to lscpu (bnc#652305) +- 2.13.189 + +------------------------------------------------------------------- Mon Nov 8 13:35:25 CET 2010 - jsrain@suse.cz - add HyperV drivers to initrd (bnc#651348) Modified: branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp?rev=62773&r1=62772&r2=62773&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/packager/src/clients/inst_kickoff.ycp Tue Nov 9 14:43:21 2010 @@ -57,8 +57,8 @@ } void HyperVPVToInitrd() { - // can the kernel modules be loaded? - if (0 == (integer)SCR::Execute(.target.bash, "/sbin/modprobe vmbus")) + // check the running hypervisor + if (0 == (integer)SCR::Execute(.target.bash, "LANG=C lscpu | grep 'Hypervisor vendor:[[:space:]]*Microsoft' >/dev/null"); { // add modules to initrd Initrd::AddModule ("blkvsc", ""); @@ -76,7 +76,7 @@ } else { - y2milestone("Cannot load vmbus kernel module, skipping HyperV PV driver installation"); + y2milestone("HyperV hypervisor not detected"); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org