summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-06-27 14:42:36 +0100
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-06-27 14:42:36 +0100
commitf4753fbcc0f84bf1f6e117e5f983ccffd3a5f93e (patch)
tree457d12f19c743d17b76ea68089185ff967d613dc /plugins
parent044cbc632ead87762796f999d5c9dc41e899156b (diff)
parent8a8c013cd4513b07e936125a23188e7608f40d58 (diff)
downloadnova-f4753fbcc0f84bf1f6e117e5f983ccffd3a5f93e.tar.gz
nova-f4753fbcc0f84bf1f6e117e5f983ccffd3a5f93e.tar.xz
nova-f4753fbcc0f84bf1f6e117e5f983ccffd3a5f93e.zip
Merge trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
index feaf1312d..d42a11eff 100644
--- a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
@@ -8,7 +8,7 @@
fi
;;
-@@ -224,9 +225,11 @@
+@@ -224,6 +225,7 @@
remove)
if [ "${TYPE}" = "vif" ] ;then
@@ -16,7 +16,3 @@
xenstore-rm "${HOTPLUG}/hotplug"
fi
logger -t scripts-vif "${dev} has been removed"
- remove_from_bridge
- ;;
- esac
-+