From 7b8ae4d5110204dc41375219cdd3ce68ebec2f2a Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Wed, 29 May 2013 17:05:03 -0700 Subject: [PATCH] virt-what does't report correct hypervisor on some new platform, use /proc/xen for XS --- patches/systemvm/debian/config/etc/init.d/cloud-early-config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 ca3b970210b..7be8663ff51 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