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
virt-what.in: warn about missing cpuid-virt helper program
[virt-what.git]
/
virt-what.in
diff --git
a/virt-what.in
b/virt-what.in
index
422f6d0
..
5ae1ccb
100644
(file)
--- a/
virt-what.in
+++ b/
virt-what.in
@@
-1,4
+1,4
@@
-#!/bin/
ba
sh -
+#!/bin/sh -
# @configure_input@
# Copyright (C) 2008-2011 Red Hat Inc.
#
# @configure_input@
# Copyright (C) 2008-2011 Red Hat Inc.
#
@@
-18,13
+18,13
@@
# 'virt-what' tries to detect the type of virtualization being
# used (or none at all if we're running on bare-metal). It prints
# 'virt-what' tries to detect the type of virtualization being
# used (or none at all if we're running on bare-metal). It prints
-# out one o
f
more lines each being a 'fact' about the virtualization.
+# out one o
r
more lines each being a 'fact' about the virtualization.
#
# Please see also the manual page virt-what(1).
# This script should be run as root.
#
# The following resources were useful in writing this script:
#
# Please see also the manual page virt-what(1).
# This script should be run as root.
#
# The following resources were useful in writing this script:
-# . http://
www.dmo.ca/blog/20080530151107
+# . http://
dmo.ca/blog/detecting-virtualization-on-linux/
# Do not allow unset variables, and set defaults.
set -u
# Do not allow unset variables, and set defaults.
set -u
@@
-33,12
+33,12
@@
skip_qemu_kvm=false
VERSION="@VERSION@"
VERSION="@VERSION@"
-f
unction fail
{
+f
ail()
{
echo "virt-what: $1" >&2
exit 1
}
echo "virt-what: $1" >&2
exit 1
}
-
function usage
{
+
usage()
{
echo "virt-what [options]"
echo "Options:"
echo " --help Display this help"
echo "virt-what [options]"
echo "Options:"
echo " --help Display this help"
@@
-67,18
+67,25
@@
while true; do
done
# Add /sbin and /usr/sbin to the path so we can find system
done
# Add /sbin and /usr/sbin to the path so we can find system
-# binaries like dmicode.
+# binaries like dmi
de
code.
# Add /usr/libexec to the path so we can find the helper binary.
prefix=@prefix@
exec_prefix=@exec_prefix@
PATH="${root}@libexecdir@:${root}/sbin:${root}/usr/sbin:${PATH}"
# Check we're running as root.
# Add /usr/libexec to the path so we can find the helper binary.
prefix=@prefix@
exec_prefix=@exec_prefix@
PATH="${root}@libexecdir@:${root}/sbin:${root}/usr/sbin:${PATH}"
# Check we're running as root.
+EFFUID=$(id -u) || fail "failed to get current user id"
-if [ "x$root" = "x" ] && [ "$EUID" -ne 0 ]; then
+if [ "x$root" = "x" ] && [ "$E
FF
UID" -ne 0 ]; then
fail "this script must be run as root"
fi
fail "this script must be run as root"
fi
+# Try to locate the CPU-ID helper program
+CPUID_HELPER=$(which virt-what-cpuid-helper 2>/dev/null)
+if [ -z "$CPUID_HELPER" ] ; then
+ fail "virt-what-cpuid-helper program not found in \$PATH"
+fi
+
# Many fullvirt hypervisors give an indication through CPUID. Use the
# helper program to get this information.
# Many fullvirt hypervisors give an indication through CPUID. Use the
# helper program to get this information.
@@
-197,9
+204,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
@@
-248,3
+255,8
@@
if ! "$skip_qemu_kvm"; then
fi
fi
fi
fi
fi
fi
+
+# Check for Docker.
+if [ -f "${root}/.dockerinit" ]; then
+ echo docker
+fi