X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=4b6d3b84570cb406b49ff99ef4ad9ed8b36b2135;hb=eab67e2c2d9fcf75f9600b21f68f8cfe5129d67e;hp=f12c95beb973f8fc632958c32d8caf2baa839cf3;hpb=bee93957490d0f98c3bea749d4b2d3cbba10794d;p=virt-what.git

diff --git a/virt-what.in b/virt-what.in
index f12c95b..4b6d3b8 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -147,6 +147,11 @@ fi
 # Check for Linux-VServer
 if cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
     echo linux_vserver
+    if grep -q "VxID: 0$" "${root}/proc/self/status"; then
+        echo linux_vserver-host
+    else
+        echo linux_vserver-guest
+    fi
 fi
 
 # Check for UML.
@@ -192,9 +197,9 @@ fi
 if [ "$cpuid" = "XenVMMXenVMM" ]; then
     echo xen; echo xen-hvm
     skip_qemu_kvm=true
-elif [ -f "${root}/proc/xen/capabilities" ]; then
+elif [ -d "${root}/proc/xen" ]; then
     echo xen
-    if grep -q "control_d" "${root}/proc/xen/capabilities"; then
+    if grep -q "control_d" "${root}/proc/xen/capabilities" 2>/dev/null; then
         echo xen-dom0
     else
         echo xen-domU