Updated Branches: refs/heads/master 51930405d -> 7b8ae4d51
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/7b8ae4d5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7b8ae4d5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7b8ae4d5 Branch: refs/heads/master Commit: 7b8ae4d5110204dc41375219cdd3ce68ebec2f2a Parents: 5193040 Author: Anthony Xu <anthony...@citrix.com> Authored: Wed May 29 17:05:03 2013 -0700 Committer: Anthony Xu <anthony...@citrix.com> Committed: Wed May 29 17:05:03 2013 -0700 ---------------------------------------------------------------------- .../debian/config/etc/init.d/cloud-early-config | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b8ae4d5/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 ca3b970..7be8663 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -87,14 +87,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
