Direct output from fail() to stderr

[virt-what.git] / virt-what.in

diff --git a/virt-what.in b/virt-what.in
index d62f7c8..297956d 100644 (file)
--- a/virt-what.in
+++ b/virt-what.in
@@ -34,7 +34,7 @@ skip_qemu_kvm=false
 VERSION="@VERSION@"
 
 function fail {
-    echo "virt-what: $1"
+    echo "virt-what: $1" >&2
     exit 1
 }
 
@@ -75,8 +75,7 @@ PATH=$root@libexecdir@:$root/sbin:$root/usr/sbin:$PATH
 
 # Check we're running as root.
 
-uid=`id -u`
-if [ "$uid" != 0 ]; then
+if [ "x$root" = "x" ] && [ "$EUID" -ne 0 ]; then
     fail "this script must be run as root"
 fi
 
@@ -154,7 +153,7 @@ fi
 
 # Check for Hitachi Virtualization Manager (HVM) Virtage logical partitioning.
 if echo "$dmi" | grep -q 'Manufacturer.*HITACHI' &&
-   echo "$dmi" | grep -q 'Product.*HVM LPAR'; then
+   echo "$dmi" | grep -q 'Product.* LPAR'; then
     echo virtage
 fi