X-Git-Url: http://git.annexia.org/?p=virt-what.git;a=blobdiff_plain;f=virt-what.in;h=e311067c149e74324b8936e208f68d84e7fb2dbd;hp=2324f1275eb7f6030e4aade093fe4307dc26c4bb;hb=f74a5f24635f8dbb202ad1c7ea141606ca864f1f;hpb=60d20f2a64ee71601acc21927c520654cc083644

diff --git a/virt-what.in b/virt-what.in
index 2324f12..e311067 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -43,19 +43,31 @@ function usage {
 
 # Handle the command line arguments, if any.
 
-TEMP=`getopt -o v --long help --long version -n 'virt-what' -- "$@"`
+TEMP=`getopt -o v --long help --long version --long test-root: -n 'virt-what' -- "$@"`
 if [ $? != 0 ]; then exit 1; fi
 eval set -- "$TEMP"
 
 while true; do
     case "$1" in
 	--help) usage ;;
+        --test-root)
+            # Deliberately undocumented: used for 'make check'.
+            root="$2"
+            shift 2
+            ;;
 	-v|--version) echo $VERSION; exit 0 ;;
 	--) shift; break ;;
-	*) fail "internal error" ;;
+	*) fail "internal error ($1)" ;;
     esac
 done
 
+# Add /sbin and /usr/sbin to the path so we can find system
+# binaries like dmicode.
+# 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.
 
 uid=`id -u`
@@ -63,13 +75,6 @@ if [ "$uid" != 0 ]; then
     fail "this script must be run as root"
 fi
 
-# Add /sbin and /usr/sbin to the path so we can find system
-# binaries like dmicode.
-# Add /usr/libexec to the path so we can find the helper binary.
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-PATH=@libexecdir@:/sbin:/usr/sbin:$PATH
-
 # Many fullvirt hypervisors give an indication through CPUID.  Use the
 # helper program to get this information.
 
@@ -112,18 +117,18 @@ fi
 # container)
 # /proc/bc - exists on node, but not inside container.
 
-if [ -d /proc/vz -a ! -d /proc/bc ]; then
+if [ -d $root/proc/vz -a ! -d $root/proc/bc ]; then
     echo openvz
 fi
 
 # Check for UML.
 # Added by Laurent Léonard.
-if grep -q 'UML' /proc/cpuinfo; then
+if grep -q 'UML' $root/proc/cpuinfo; then
     echo uml
 fi
 
 # Check for IBM PowerVM Lx86 Linux/x86 emulator.
-if grep -q '^vendor_id.*PowerVM Lx86' /proc/cpuinfo; then
+if grep -q '^vendor_id.*PowerVM Lx86' $root/proc/cpuinfo; then
     echo powervm_lx86
 fi
 
@@ -138,15 +143,15 @@ fi
 if [ "$cpuid" = "XenVMMXenVMM" ]; then
     echo xen; echo xen-hvm
     is_xen=1
-elif [ -f /proc/xen/capabilities ]; then
+elif [ -f $root/proc/xen/capabilities ]; then
     echo xen
-    if grep -q "control_d" /proc/xen/capabilities; then
+    if grep -q "control_d" $root/proc/xen/capabilities; then
         echo xen-dom0
     else
         echo xen-domU
     fi
     is_xen=1
-elif [ -d /proc/xen ]; then
+elif [ -d $root/proc/xen ]; then
     # This directory can be present when Xen paravirt drivers are
     # installed, even on baremetal.  Don't confuse people by
     # printing anything.
@@ -159,7 +164,7 @@ if [ ! "$is_xen" ]; then
     # Disable this test if we know this is Xen already, because Xen
     # uses QEMU for its device model.
 
-    if grep -q 'QEMU' /proc/cpuinfo; then
+    if grep -q 'QEMU' $root/proc/cpuinfo; then
 	if [ "$cpuid" = "KVMKVMKVM" ]; then
 	    echo kvm
 	else