File 22499-xen-hotplug-cleanup.patch of Package xen.import4929

Index: xen-4.0.2-testing/tools/hotplug/Linux/xen-hotplug-cleanup
===================================================================
--- xen-4.0.2-testing.orig/tools/hotplug/Linux/xen-hotplug-cleanup
+++ xen-4.0.2-testing/tools/hotplug/Linux/xen-hotplug-cleanup
@@ -21,10 +21,12 @@ if [ "$vm" != "" ]; then
 
   # 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
-    vm_dev="$vm/device/tap2/${path_array[3]}"
-  fi
+  $(xenstore-read "$vm_dev" 2>/dev/null) || \
+  {
+     if [ "${path_array[1]}" = "vbd" ]; then
+        vm_dev="$vm/device/tap2/${path_array[3]}"
+     fi
+  }
 else
   vm_dev=
 fi