diff -r 2c3495f3ca84 tools/hotplug/Linux/xen-hotplug-cleanup
--- a/tools/hotplug/Linux/xen-hotplug-cleanup	Fri Jun 04 10:50:55 2010 +0100
+++ b/tools/hotplug/Linux/xen-hotplug-cleanup	Mon Jun 07 00:23:24 2010 +0400
@@ -21,8 +21,8 @@
 
   # if the vm path does not exist and the device class is 'vbd' then we may have
   # a tap2 device
-  if [ $(xenstore-read "$vm_dev" 2>/dev/null) != "" ] \
-       && [ "${path_array[1]}" = "vbd" ]; then
+  if [ x$(xenstore-read "$vm_dev" 2>/dev/null) != "x" ] \
+       && [ x"${path_array[1]}" = "xvbd" ]; then
     vm_dev="$vm/device/tap2/${path_array[3]}"
   fi
 else