You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/06/26 11:30:12 UTC
[02/25] git commit: updated refs/heads/advancedsg-leaseweb to c5383c8
virt-what does't report correct hypervisor on some new platform, use /proc/xen for XS
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a810a2f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a810a2f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a810a2f0
Branch: refs/heads/advancedsg-leaseweb
Commit: a810a2f0f66cb365725db645c4c9ff99d1ee9cf7
Parents: 5a4ecb9
Author: Anthony Xu <an...@citrix.com>
Authored: Wed May 29 17:05:03 2013 -0700
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Tue Jun 11 09:37:57 2013 +0200
----------------------------------------------------------------------
patches/systemvm/debian/config/etc/init.d/cloud-early-config | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a810a2f0/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index ee3683f..8758a80 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -82,14 +82,13 @@ EOF
hypervisor() {
[ -d /proc/xen ] && mount -t xenfs none /proc/xen
+ [ -d /proc/xen ] && echo "xen-domU" && return 0
local try=$([ -x /usr/sbin/virt-what ] && virt-what | tail -1)
[ "$try" != "" ] && echo $try && return 0
vmware-checkvm &> /dev/null && echo "vmware" && return 0
- [ -d /proc/xen ] && echo "xen-domU" && return 0
-
grep -q QEMU /proc/cpuinfo && echo "kvm" && return 0
grep -q QEMU /var/log/messages && echo "kvm" && return 0