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: verify files exists before grepping them
[virt-what.git]
/
virt-what.in
diff --git
a/virt-what.in
b/virt-what.in
index
c04203e
..
6e9aef1
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.
#
@@
-33,12
+33,16
@@
skip_qemu_kvm=false
VERSION="@VERSION@"
VERSION="@VERSION@"
-function fail {
+have_cpuinfo() {
+ test -e "${root}/proc/cpuinfo"
+}
+
+fail() {
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"
@@
-74,11
+78,18
@@
exec_prefix=@exec_prefix@
PATH="${root}@libexecdir@:${root}/sbin:${root}/usr/sbin:${PATH}"
# Check we're running as root.
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.
@@
-145,7
+156,8
@@
if [ -e "${root}/proc/1/environ" ] &&
fi
# Check for Linux-VServer
fi
# Check for Linux-VServer
-if cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
+if test -e "${root}/proc/self/status" \
+ && 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
echo linux_vserver
if grep -q "VxID: 0$" "${root}/proc/self/status"; then
echo linux_vserver-host
@@
-156,12
+168,13
@@
fi
# Check for UML.
# Added by Laurent Léonard.
# Check for UML.
# Added by Laurent Léonard.
-if grep -q 'UML' "${root}/proc/cpuinfo"; then
+if
have_cpuinfo &&
grep -q 'UML' "${root}/proc/cpuinfo"; then
echo uml
fi
# Check for IBM PowerVM Lx86 Linux/x86 emulator.
echo uml
fi
# Check for IBM PowerVM Lx86 Linux/x86 emulator.
-if grep -q '^vendor_id.*PowerVM Lx86' "${root}/proc/cpuinfo"; then
+if have_cpuinfo && grep -q '^vendor_id.*PowerVM Lx86' "${root}/proc/cpuinfo"
+then
echo powervm_lx86
fi
echo powervm_lx86
fi
@@
-172,7
+185,7
@@
if echo "$dmi" | grep -q 'Manufacturer.*HITACHI' &&
fi
# Check for IBM SystemZ.
fi
# Check for IBM SystemZ.
-if grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then
+if
have_cpuinfo &&
grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then
echo ibm_systemz
if [ -f "${root}/proc/sysinfo" ]; then
if grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then
echo ibm_systemz
if [ -f "${root}/proc/sysinfo" ]; then
if grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then