git.annexia.org
/
virt-what.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xen: Don't emit warning message if /proc/xen/capabilities file does not exist.
[virt-what.git]
/
virt-what.in
diff --git
a/virt-what.in
b/virt-what.in
index
f12c95b
..
4b6d3b8
100644
(file)
--- 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
# 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.
fi
# Check for UML.
@@
-192,9
+197,9
@@
fi
if [ "$cpuid" = "XenVMMXenVMM" ]; then
echo xen; echo xen-hvm
skip_qemu_kvm=true
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
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
echo xen-dom0
else
echo xen-domU